diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d654a4757f9..5bfbc1701a7 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,6 +7,15 @@ Changelog --------- +v2.2 +==== + +API changes and deprecations: + +* The edit() and after_update() methods of IPackageController plugins are now + called when updating a resource using the web frontend or the + resource_update API action [#1052] + v2.0.1 2013-06-11 ================= @@ -423,7 +432,7 @@ v1.5 2011-11-07 Major: * New visual theme (#1108) * Package & Resource edit overhaul (#1294/#1348/#1351/#1368/#1296) - * JS and CSS reorganisation (#1282, #1349, #1380) + * JS and CSS reorganization (#1282, #1349, #1380) * Apache Solr used for search in core instead of Postgres (#1275, #1361, #1365) * Authorization system now embedded in the logic layer (#1253) * Captcha added for user registration (#1307, #1431) diff --git a/bin/ckan_edit_local.py b/bin/ckan_edit_local.py index 680700e9ba5..6e13575eb25 100644 --- a/bin/ckan_edit_local.py +++ b/bin/ckan_edit_local.py @@ -84,6 +84,7 @@ def canada_extras(): 'Level of Government':'level_of_government', } license_mapping = { + # CS: bad_spelling ignore 'http://geogratis.ca/geogratis/en/licence.jsp':'geogratis', 'Crown Copyright':'canada-crown', } diff --git a/ckan/__init__.py b/ckan/__init__.py index bcc319eb7d8..c008dc65ba7 100644 --- a/ckan/__init__.py +++ b/ckan/__init__.py @@ -1,4 +1,4 @@ -__version__ = '2.1a' +__version__ = '2.2a' __description__ = 'Comprehensive Knowledge Archive Network (CKAN) Software' __long_description__ = \ diff --git a/ckan/config/deployment.ini_tmpl b/ckan/config/deployment.ini_tmpl index 53ddc80c108..738ff22858d 100644 --- a/ckan/config/deployment.ini_tmpl +++ b/ckan/config/deployment.ini_tmpl @@ -107,7 +107,7 @@ ckan.preview.loadable = html htm rdf+xml owl+xml xml n3 n-triples turtle plain a ckan.locale_default = en ckan.locale_order = en pt_BR ja it cs_CZ ca es fr el sv sr sr@latin no sk fi ru de pl nl bg ko_KR hu sa sl lv ckan.locales_offered = -ckan.locales_filtered_out = +ckan.locales_filtered_out = en_GB ## Feeds Settings diff --git a/ckan/config/routing.py b/ckan/config/routing.py index 0d3c00c5838..aba76212bad 100644 --- a/ckan/config/routing.py +++ b/ckan/config/routing.py @@ -279,7 +279,6 @@ def make_map(): requirements=dict(action='|'.join([ 'edit', 'delete', - 'members', 'member_new', 'member_delete', 'history', @@ -291,6 +290,10 @@ def make_map(): ]))) m.connect('group_about', '/group/about/{id}', action='about', ckan_icon='info-sign'), + m.connect('group_edit', '/group/edit/{id}', action='edit', + ckan_icon='edit') + m.connect('group_members', '/group/members/{id}', action='members', + ckan_icon='group'), m.connect('group_activity', '/group/activity/{id}/{offset}', action='activity', ckan_icon='time'), m.connect('group_read', '/group/{id}', action='read', @@ -343,9 +346,15 @@ def make_map(): m.connect('/user/activity/{id}/{offset}', action='activity') m.connect('user_activity_stream', '/user/activity/{id}', action='activity', ckan_icon='time') - m.connect('/dashboard/{offset}', action='dashboard') m.connect('user_dashboard', '/dashboard', action='dashboard', ckan_icon='list') + m.connect('user_dashboard_datasets', '/dashboard/datasets', + action='dashboard_datasets', ckan_icon='sitemap') + m.connect('user_dashboard_groups', '/dashboard/groups', + action='dashboard_groups', ckan_icon='group') + m.connect('user_dashboard_organizations', '/dashboard/organizations', + action='dashboard_organizations', ckan_icon='building') + m.connect('/dashboard/{offset}', action='dashboard') m.connect('user_follow', '/user/follow/{id}', action='follow') m.connect('/user/unfollow/{id}', action='unfollow') m.connect('user_followers', '/user/followers/{id:.*}', diff --git a/ckan/controllers/api.py b/ckan/controllers/api.py index 0eebd90f2e3..22ea7d4f5c3 100644 --- a/ckan/controllers/api.py +++ b/ckan/controllers/api.py @@ -158,7 +158,7 @@ def action(self, logic_function, ver=None): except KeyError: log.error('Can\'t find logic function: %s' % logic_function) return self._finish_bad_request( - _('Action name not known: %s') % str(logic_function)) + _('Action name not known: %s') % logic_function) context = {'model': model, 'session': model.Session, 'user': c.user, 'api_version': ver} @@ -169,9 +169,9 @@ def action(self, logic_function, ver=None): request_data = self._get_request_data(try_url_params= side_effect_free) except ValueError, inst: - log.error('Bad request data: %s' % str(inst)) + log.error('Bad request data: %s' % inst) return self._finish_bad_request( - _('JSON Error: %s') % str(inst)) + _('JSON Error: %s') % inst) if not isinstance(request_data, dict): # this occurs if request_data is blank log.error('Bad request data - not dict: %r' % request_data) @@ -210,6 +210,7 @@ def action(self, logic_function, ver=None): error_dict['__type'] = 'Validation Error' return_dict['error'] = error_dict return_dict['success'] = False + # CS nasty_string ignore log.error('Validation error: %r' % str(e.error_dict)) return self._finish(409, return_dict, content_type='json') except search.SearchQueryError, e: @@ -334,7 +335,7 @@ def create(self, ver=None, register=None, subregister=None, data_dict.update(request_data) except ValueError, inst: return self._finish_bad_request( - _('JSON Error: %s') % str(inst)) + _('JSON Error: %s') % inst) action = self._get_action_from_map(action_map, register, subregister) if not action: @@ -357,6 +358,7 @@ def create(self, ver=None, register=None, subregister=None, extra_msg = e.extra_msg return self._finish_not_found(extra_msg) except ValidationError, e: + # CS: nasty_string ignore log.error('Validation error: %r' % str(e.error_dict)) return self._finish(409, e.error_dict, content_type='json') except DataError, e: @@ -396,7 +398,7 @@ def update(self, ver=None, register=None, subregister=None, data_dict.update(request_data) except ValueError, inst: return self._finish_bad_request( - _('JSON Error: %s') % str(inst)) + _('JSON Error: %s') % inst) action = self._get_action_from_map(action_map, register, subregister) if not action: @@ -412,6 +414,7 @@ def update(self, ver=None, register=None, subregister=None, extra_msg = e.extra_msg return self._finish_not_found(extra_msg) except ValidationError, e: + # CS: nasty_string ignore log.error('Validation error: %r' % str(e.error_dict)) return self._finish(409, e.error_dict, content_type='json') except DataError, e: @@ -459,6 +462,7 @@ def delete(self, ver=None, register=None, subregister=None, extra_msg = e.extra_msg return self._finish_not_found(extra_msg) except ValidationError, e: + # CS: nasty_string ignore log.error('Validation error: %r' % str(e.error_dict)) return self._finish(409, e.error_dict, content_type='json') diff --git a/ckan/controllers/group.py b/ckan/controllers/group.py index 529d108ecdb..ccef46bfe78 100644 --- a/ckan/controllers/group.py +++ b/ckan/controllers/group.py @@ -281,7 +281,7 @@ def pager_url(q=None, page=None): default_facet_titles = {'groups': _('Groups'), 'tags': _('Tags'), 'res_format': _('Formats'), - 'license': _('License')} + 'license_id': _('License')} for facet in g.facets: if facet in default_facet_titles: @@ -524,7 +524,7 @@ def _save_edit(self, id, context): if id != group['name']: self._force_reindex(group) - h.redirect_to('%s_read' % str(group['type']), id=group['name']) + h.redirect_to('%s_read' % group['type'], id=group['name']) except NotAuthorized: abort(401, _('Unauthorized to read group %s') % id) except NotFound, e: diff --git a/ckan/controllers/organization.py b/ckan/controllers/organization.py index b411f8e2b31..b44d95e057f 100644 --- a/ckan/controllers/organization.py +++ b/ckan/controllers/organization.py @@ -19,7 +19,7 @@ def _group_form(self, group_type=None): return 'organization/new_organization_form.html' def _form_to_db_schema(self, group_type=None): - return lookup_group_plugin(group_type).form_to_db_schema() + return group.lookup_group_plugin(group_type).form_to_db_schema() def _db_to_form_schema(self, group_type=None): '''This is an interface to manipulate data from the database @@ -48,7 +48,7 @@ def _read_template(self, group_type): return 'organization/read.html' def _history_template(self, group_type): - return lookup_group_plugin(group_type).history_template() + return group.lookup_group_plugin(group_type).history_template() def _edit_template(self, group_type): return 'organization/edit.html' diff --git a/ckan/controllers/package.py b/ckan/controllers/package.py index 65541ee33bf..834b3ba38b0 100644 --- a/ckan/controllers/package.py +++ b/ckan/controllers/package.py @@ -344,6 +344,11 @@ def read(self, id, format='html'): c.current_package_id = c.pkg.id c.related_count = c.pkg.related_count + # can the resources be previewed? + for resource in c.pkg_dict['resources']: + resource['can_be_previewed'] = self._resource_preview( + {'resource': resource, 'package': c.pkg_dict}) + self._setup_template_variables(context, {'id': id}, package_type=package_type) @@ -1142,8 +1147,17 @@ def resource_read(self, id, resource_id): c.datastore_api = '%s/api/action' % config.get('ckan.site_url', '').rstrip('/') c.related_count = c.pkg.related_count + + c.resource['can_be_previewed'] = self._resource_preview( + {'resource': c.resource, 'package': c.package}) return render('package/resource_read.html') + def _resource_preview(self, data_dict): + return bool(datapreview.res_format(data_dict['resource']) + in datapreview.direct() + datapreview.loadable() + or datapreview.get_preview_plugin( + data_dict, return_first=True)) + def resource_download(self, id, resource_id): """ Provides a direct download by redirecting the user to the url stored @@ -1319,9 +1333,9 @@ def resource_datapreview(self, id, resource_id): ''' Embeded page for a resource data-preview. - Depending on the type, different previews are loaded. - This could be an img tag where the image is loaded directly or an iframe that - embeds a webpage, recline or a pdf preview. + Depending on the type, different previews are loaded. This could be an + img tag where the image is loaded directly or an iframe that embeds a + webpage, recline or a pdf preview. ''' context = { 'model': model, @@ -1335,30 +1349,17 @@ def resource_datapreview(self, id, resource_id): c.package = get_action('package_show')(context, {'id': id}) data_dict = {'resource': c.resource, 'package': c.package} - on_same_domain = datapreview.resource_is_on_same_domain(data_dict) - data_dict['resource']['on_same_domain'] = on_same_domain - - # FIXME this wants to not use plugins as it is an imported name - # and we already import it an p should really only be in - # extensu=ions in my opinion also just make it look nice and be - # readable grrrrrr - plugins = p.PluginImplementations(p.IResourcePreview) - plugins_that_can_preview = [plugin for plugin in plugins - if plugin.can_preview(data_dict)] - if len(plugins_that_can_preview) == 0: - abort(409, _('No preview has been defined.')) - if len(plugins_that_can_preview) > 1: - log.warn('Multiple previews are possible. {0}'.format( - plugins_that_can_preview)) - plugin = plugins_that_can_preview[0] - plugin.setup_template_variables(context, data_dict) + preview_plugin = datapreview.get_preview_plugin(data_dict) - c.resource_json = json.dumps(c.resource) + if preview_plugin is None: + abort(409, _('No preview has been defined.')) + preview_plugin.setup_template_variables(context, data_dict) + c.resource_json = json.dumps(c.resource) except NotFound: abort(404, _('Resource not found')) except NotAuthorized: abort(401, _('Unauthorized to read resource %s') % id) else: - return render(plugin.preview_template(context, data_dict)) + return render(preview_plugin.preview_template(context, data_dict)) diff --git a/ckan/controllers/user.py b/ckan/controllers/user.py index 7fdd6534605..ab162ef0659 100644 --- a/ckan/controllers/user.py +++ b/ckan/controllers/user.py @@ -1,9 +1,9 @@ import logging from urllib import quote +from urlparse import urlparse from pylons import config -import ckan.lib.i18n as i18n import ckan.lib.base as base import ckan.model as model import ckan.lib.helpers as h @@ -15,7 +15,7 @@ import ckan.lib.navl.dictization_functions as dictization_functions import ckan.plugins as p -from ckan.common import _, session, c, g, request +from ckan.common import _, c, g, request log = logging.getLogger(__name__) @@ -301,12 +301,6 @@ def _save_edit(self, id, context): return self.edit(id, data_dict, errors, error_summary) def login(self, error=None): - lang = session.pop('lang', None) - if lang: - session.save() - return h.redirect_to(locale=str(lang), controller='user', - action='login') - # Do any plugin login stuff for item in p.PluginImplementations(p.IAuthenticator): item.login() @@ -320,7 +314,10 @@ def login(self, error=None): g.openid_enabled = False if not c.user: - came_from = request.params.get('came_from', '') + came_from = request.params.get('came_from') + if not came_from: + came_from = h.url_for(controller='user', action='logged_in', + __ckan_no_root=True) c.login_handler = h.url_for( self._get_repoze_handler('login_handler_path'), came_from=came_from) @@ -333,14 +330,10 @@ def login(self, error=None): return render('user/logout_first.html') def logged_in(self): - # we need to set the language via a redirect - lang = session.pop('lang', None) - session.save() + # redirect if needed came_from = request.params.get('came_from', '') - - # we need to set the language explicitly here or the flash - # messages will not be translated. - i18n.set_lang(lang) + if self._sane_came_from(came_from): + return h.redirect_to(str(came_from)) if c.user: context = None @@ -350,8 +343,6 @@ def logged_in(self): h.flash_success(_("%s is now logged in") % user_dict['display_name']) - if came_from: - return h.redirect_to(str(came_from)) return self.me() else: err = _('Login failed. Bad username or password.') @@ -360,34 +351,26 @@ def logged_in(self): 'with a user account.)') if h.asbool(config.get('ckan.legacy_templates', 'false')): h.flash_error(err) - h.redirect_to(locale=lang, controller='user', + h.redirect_to(controller='user', action='login', came_from=came_from) else: return self.login(error=err) def logout(self): - # save our language in the session so we don't lose it - session['lang'] = request.environ.get('CKAN_LANG') - session.save() - # Do any plugin logout stuff for item in p.PluginImplementations(p.IAuthenticator): item.logout() - - h.redirect_to(self._get_repoze_handler('logout_handler_path')) - - def set_lang(self, lang): - # this allows us to set the lang in session. Used for logging - # in/out to prevent being lost when repoze.who redirects things - session['lang'] = str(lang) - session.save() + url = h.url_for(controller='user', action='logged_out_page', + __ckan_no_root=True) + h.redirect_to(self._get_repoze_handler('logout_handler_path') + + '?came_from=' + url) def logged_out(self): - # we need to get our language info back and the show the correct page - lang = session.get('lang') - c.user = None - session.delete() - h.redirect_to(locale=lang, controller='user', action='logged_out_page') + # redirect if needed + came_from = request.params.get('came_from', '') + if self._sane_came_from(came_from): + return h.redirect_to(str(came_from)) + h.redirect_to(controller='user', action='logged_out_page') def logged_out_page(self): return render('user/logout.html') @@ -619,6 +602,24 @@ def dashboard(self, id=None, offset=0): return render('user/dashboard.html') + def dashboard_datasets(self): + context = {'for_view': True} + data_dict = {'user_obj': c.userobj} + self._setup_template_variables(context, data_dict) + return render('user/dashboard_datasets.html') + + def dashboard_organizations(self): + context = {'for_view': True} + data_dict = {'user_obj': c.userobj} + self._setup_template_variables(context, data_dict) + return render('user/dashboard_organizations.html') + + def dashboard_groups(self): + context = {'for_view': True} + data_dict = {'user_obj': c.userobj} + self._setup_template_variables(context, data_dict) + return render('user/dashboard_groups.html') + def follow(self, id): '''Start following this user.''' context = {'model': model, @@ -657,3 +658,14 @@ def unfollow(self, id): or e.error_dict) h.flash_error(error_message) h.redirect_to(controller='user', action='read', id=id) + + def _sane_came_from(self, url): + '''Returns True if came_from is local''' + if not url or (len(url) >= 2 and url.startswith('//')): + return False + parsed = urlparse(url) + if parsed.scheme: + domain = urlparse(h.url_for('/', qualified=True)).netloc + if domain != parsed.netloc: + return False + return True diff --git a/ckan/lib/activity_streams.py b/ckan/lib/activity_streams.py index d558994d5f6..47467cf2ede 100644 --- a/ckan/lib/activity_streams.py +++ b/ckan/lib/activity_streams.py @@ -256,7 +256,7 @@ def activity_list_to_html(context, activity_stream, extra_vars): if not activity_type in activity_stream_string_functions: raise NotImplementedError("No activity renderer for activity " - "type '%s'" % str(activity_type)) + "type '%s'" % activity_type) if activity_type in activity_stream_string_icons: activity_icon = activity_stream_string_icons[activity_type] diff --git a/ckan/lib/base.py b/ckan/lib/base.py index 5c755650c21..7640b3dc7e8 100644 --- a/ckan/lib/base.py +++ b/ckan/lib/base.py @@ -25,6 +25,7 @@ import ckan.lib.app_globals as app_globals from ckan.plugins import PluginImplementations, IGenshiStreamFilter, IAuthenticator import ckan.model as model +import ckan.lib.maintain as maintain # These imports are for legacy usages and will be removed soon these should # be imported directly from ckan.common for internal ckan code and via the @@ -224,15 +225,9 @@ def __before__(self, action, **params): i18n.handle_request(request, c) - # If the user is logged in add their number of new activities to the - # template context. - if c.userobj: - from ckan.logic import get_action - new_activities_count = get_action( - 'dashboard_new_activities_count') - context = {'model': model, 'session': model.Session, - 'user': c.user or c.author} - c.new_activities = new_activities_count(context, {}) + maintain.deprecate_context_item( + 'new_activities', + 'Use `h.new_activities` instead.') def _identify_user(self): '''Try to identify the user diff --git a/ckan/lib/celery_app.py b/ckan/lib/celery_app.py index 95f15937f18..f95fcae3447 100644 --- a/ckan/lib/celery_app.py +++ b/ckan/lib/celery_app.py @@ -4,7 +4,6 @@ from pylons import config as pylons_config from pkg_resources import iter_entry_points, VersionConflict -#from celery.loaders.base import BaseLoader log = logging.getLogger(__name__) @@ -49,16 +48,16 @@ log.critical(error) pass -celery.conf.update(default_config) -celery.loader.conf.update(default_config) - try: for key, value in config.items('app:celery'): if key in LIST_PARAMS: - celery.conf[key.upper()] = value.split() - celery.loader.conf[key.upper()] = value.split() + default_config[key.upper()] = value.split() else: - celery.conf[key.upper()] = value - celery.loader.conf[key.upper()] = value.split() + default_config[key.upper()] = value except ConfigParser.NoSectionError: pass + +# Thes update of configuration means it is only possible to set each +# key once so this is done once all of the options have been decided. +celery.conf.update(default_config) +celery.loader.conf.update(default_config) diff --git a/ckan/lib/datapreview.py b/ckan/lib/datapreview.py index 27e7804bc83..1600aad81a3 100644 --- a/ckan/lib/datapreview.py +++ b/ckan/lib/datapreview.py @@ -6,6 +6,7 @@ """ import urlparse +import logging import pylons.config as config @@ -16,6 +17,27 @@ 'n3', 'n-triples', 'turtle', 'plain', 'atom', 'rss', 'txt'] +log = logging.getLogger(__name__) + + +def direct(): + ''' Directly embedable formats.''' + direct_embed = config.get('ckan.preview.direct', '').split() + return direct_embed or DEFAULT_DIRECT_EMBED + + +def loadable(): + ''' Iframe loadable formats. ''' + loadable_in_iframe = config.get('ckan.preview.loadable', '').split() + return loadable_in_iframe or DEFAULT_LOADABLE_IFRAME + + +def res_format(resource): + ''' The assummed resource format in lower case. ''' + if not resource['url']: + return None + return (resource['format'] or resource['url'].split('.')[-1]).lower() + def compare_domains(urls): ''' Return True if the domains of the provided are the same. @@ -41,7 +63,7 @@ def compare_domains(urls): return True -def resource_is_on_same_domain(data_dict): +def _on_same_domain(data_dict): # compare CKAN domain and resource URL ckan_url = config.get('ckan.site_url', '//localhost:5000') resource_url = data_dict['resource']['url'] @@ -49,14 +71,53 @@ def resource_is_on_same_domain(data_dict): return compare_domains([ckan_url, resource_url]) -def can_be_previewed(data_dict): - ''' - Determines whether there is an extension that can preview the resource. +def get_preview_plugin(data_dict, return_first=False): + '''Determines whether there is an extension that can preview the resource. :param data_dict: contains a resource and package dict. The resource dict has to have a value for ``on_same_domain`` :type data_dict: dictionary - ''' - data_dict['resource']['on_same_domain'] = resource_is_on_same_domain(data_dict) - plugins = p.PluginImplementations(p.IResourcePreview) - return any(plugin.can_preview(data_dict) for plugin in plugins) + + :param return_first: If True return the first plugin that can preview + :type return_first: bool + + Returns a dict of plugins that can preview or ones that are fixable''' + + data_dict['resource']['on_same_domain'] = _on_same_domain(data_dict) + + plugins_that_can_preview = [] + plugins_fixable = [] + for plugin in p.PluginImplementations(p.IResourcePreview): + p_info = {'plugin': plugin, 'quality': 1} + data = plugin.can_preview(data_dict) + # old school plugins return true/False + if isinstance(data, bool): + p_info['can_preview'] = data + else: + # new school provide a dict + p_info.update(data) + # if we can preview + if p_info['can_preview']: + if return_first: + plugin + plugins_that_can_preview.append(p_info) + elif p_info.get('fixable'): + plugins_fixable.append(p_info) + + num_plugins = len(plugins_that_can_preview) + if num_plugins == 0: + # we didn't find any. see if any could be made to work + for plug in plugins_fixable: + log.info('%s would allow previews to fix: %s' % ( + plug['plugin'], plug['fixable'])) + preview_plugin = None + elif num_plugins == 1: + # just one available + preview_plugin = plugins_that_can_preview[0]['plugin'] + else: + # multiple plugins so get the best one + plugs = [pl['plugin'] for pl in plugins_that_can_preview] + log.warn('Multiple previews are possible. {0}'.format(plugs)) + preview_plugin = max(plugins_that_can_preview, + key=lambda x: x['quality'])['plugin'] + return preview_plugin diff --git a/ckan/lib/formatters.py b/ckan/lib/formatters.py index 5e3d51f7c6d..193580aa28f 100644 --- a/ckan/lib/formatters.py +++ b/ckan/lib/formatters.py @@ -68,35 +68,55 @@ def _month_dec(): _month_sept, _month_oct, _month_nov, _month_dec] -def localised_nice_date(datetime_): - ''' Returns a friendly localised unicode representation of a datetime. ''' - now = datetime.datetime.now() - date_diff = now - datetime_ - days = date_diff.days - if days < 1 and now > datetime_: - # less than one day - seconds = date_diff.seconds - if seconds < 3600: - # less than one hour - if seconds < 60: - return _('Just now') +def localised_nice_date(datetime_, show_date=False, with_hours=False): + ''' Returns a friendly localised unicode representation of a datetime. + + :param datetime_: The date to format + :type datetime_: datetime + :param show_date: Show date not 2 days ago etc + :type show_date: bool + :param with_hours: should the `hours:mins` be shown for dates + :type with_hours: bool + + :rtype: sting + ''' + if not show_date: + now = datetime.datetime.now() + date_diff = now - datetime_ + days = date_diff.days + if days < 1 and now > datetime_: + # less than one day + seconds = date_diff.seconds + if seconds < 3600: + # less than one hour + if seconds < 60: + return _('Just now') + else: + return ungettext('{mins} minute ago', '{mins} minutes ago', + seconds / 60).format(mins=seconds / 60) else: - return ungettext('{mins} minute ago', '{mins} minutes ago', - seconds / 60).format(mins=seconds / 60) - else: - return ungettext('{hours} hour ago', '{hours} hours ago', - seconds / 3600).format(hours=seconds / 3600) - # more than one day - if days < 31: - return ungettext('{days} day ago', '{days} days ago', - days).format(days=days) + return ungettext('{hours} hour ago', '{hours} hours ago', + seconds / 3600).format(hours=seconds / 3600) + # more than one day + if days < 31: + return ungettext('{days} day ago', '{days} days ago', + days).format(days=days) # actual date - month = datetime_.month - day = datetime_.day - year = datetime_.year - month_name = _MONTH_FUNCTIONS[month - 1]() - return _('{month} {day}, {year}').format(month=month_name, day=day, - year=year) + details = { + 'min': datetime_.minute, + 'hour': datetime_.hour, + 'day': datetime_.day, + 'year': datetime_.year, + 'month': _MONTH_FUNCTIONS[datetime_.month - 1](), + } + if with_hours: + return ( + # NOTE: This is for translating dates like `April 24, 2013, 10:45` + _('{month} {day}, {year}, {hour:02}:{min:02}').format(**details)) + else: + return ( + # NOTE: This is for translating dates like `April 24, 2013` + _('{month} {day}, {year}').format(**details)) def localised_number(number): diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py index a38df305a6b..250fbf67e73 100644 --- a/ckan/lib/helpers.py +++ b/ckan/lib/helpers.py @@ -611,6 +611,13 @@ def check_access(action, data_dict=None): return authorized +def get_action(action_name, data_dict=None): + '''Calls an action function from a template.''' + if data_dict is None: + data_dict = {} + return logic.get_action(action_name)({}, data_dict) + + def linked_user(user, maxlength=0, avatar=20): if user in [model.PSEUDO_USER__LOGGED_IN, model.PSEUDO_USER__VISITOR]: return user @@ -773,26 +780,35 @@ def _range(self, regexp_match): def render_datetime(datetime_, date_format=None, with_hours=False): - '''Render a datetime object or timestamp string as a pretty string - (Y-m-d H:m). + '''Render a datetime object or timestamp string as a localised date or + in the requested format. If timestamp is badly formatted, then a blank string is returned. + + :param datetime_: the date + :type datetime_: datetime or ISO string format + :param date_format: a date format + :type date_format: string + :param with_hours: should the `hours:mins` be shown + :type with_hours: bool + + :rtype: string ''' - if not date_format: - date_format = '%b %d, %Y' - if with_hours: - date_format += ', %H:%M' - if isinstance(datetime_, datetime.datetime): - return datetime_.strftime(date_format) - elif isinstance(datetime_, basestring): + if isinstance(datetime_, basestring): try: datetime_ = date_str_to_datetime(datetime_) except TypeError: return '' except ValueError: return '' - return datetime_.strftime(date_format) - else: + # check we are now a datetime + if not isinstance(datetime_, datetime.datetime): return '' + # if date_format was supplied we use it + if date_format: + return datetime_.strftime(date_format) + # the localised date + return formatters.localised_nice_date(datetime_, show_date=True, + with_hours=with_hours) def date_str_to_datetime(date_str): @@ -1262,18 +1278,24 @@ def popular(type_, number, min=1, title=None): return snippet('snippets/popular.html', title=title, number=number, min=min) -def groups_available(): - ''' return a list of available groups ''' - context = {'model': model, 'session': model.Session, - 'user': c.user or c.author} - data_dict = {'available_only': True} +def groups_available(am_member=False): + '''Return a list of the groups that the user is authorized to edit. + + :param am_member: if True return only the groups the logged-in user is a + member of, otherwise return all groups that the user is authorized to + edit (for example, sysadmin users are authorized to edit all groups) + (optional, default: False) + :type am-member: boolean + + ''' + context = {} + data_dict = {'available_only': True, 'am_member': am_member} return logic.get_action('group_list_authz')(context, data_dict) def organizations_available(permission='edit_group'): ''' return a list of available organizations ''' - context = {'model': model, 'session': model.Session, - 'user': c.user} + context = {'user': c.user} data_dict = {'permission': permission} return logic.get_action('organization_list_for_user')(context, data_dict) @@ -1479,7 +1501,7 @@ def format_resource_items(items): return sorted(output, key=lambda x: x[0]) -def resource_preview(resource, pkg_id): +def resource_preview(resource, package): ''' Returns a rendered snippet for a embedded resource preview. @@ -1488,30 +1510,22 @@ def resource_preview(resource, pkg_id): that embeds a web page, recline or a pdf preview. ''' - format_lower = resource['format'].lower() - directly = False - url = '' - - data_dict = {'resource': resource, 'package': c.package} - if not resource['url']: return snippet("dataviewer/snippets/no_preview.html", resource_type=format_lower, reason=_(u'The resource url is not specified.')) - direct_embed = config.get('ckan.preview.direct', '').split() - if not direct_embed: - direct_embed = datapreview.DEFAULT_DIRECT_EMBED - loadable_in_iframe = config.get('ckan.preview.loadable', '').split() - if not loadable_in_iframe: - loadable_in_iframe = datapreview.DEFAULT_LOADABLE_IFRAME - - if datapreview.can_be_previewed(data_dict): + + format_lower = datapreview.res_format(resource) + directly = False + data_dict = {'resource': resource, 'package': package} + + if datapreview.get_preview_plugin(data_dict, return_first=True): url = url_for(controller='package', action='resource_datapreview', - resource_id=resource['id'], id=pkg_id, qualified=True) - elif format_lower in direct_embed: + resource_id=resource['id'], id=package['id'], qualified=True) + elif format_lower in datapreview.direct(): directly = True url = resource['url'] - elif format_lower in loadable_in_iframe: + elif format_lower in datapreview.loadable(): url = resource['url'] else: reason = None @@ -1569,6 +1583,19 @@ def SI_number_span(number): localised_nice_date = formatters.localised_nice_date localised_filesize = formatters.localised_filesize +def new_activities(): + '''Return the number of activities for the current user. + + See :func:`logic.action.get.dashboard_new_activities_count` for more + details. + + ''' + if not c.userobj: + return None + action = logic.get_action('dashboard_new_activities_count') + return action({}, {}) + + # these are the functions that will end up in `h` template helpers __allowed_functions__ = [ # functions defined in ckan.lib.helpers @@ -1587,6 +1614,7 @@ def SI_number_span(number): 'subnav_named_route', 'default_group_type', 'check_access', + 'get_action', 'linked_user', 'group_name_to_title', 'markdown_extract', @@ -1652,6 +1680,7 @@ def SI_number_span(number): 'localised_nice_date', 'localised_filesize', 'list_dict_filter', + 'new_activities', # imported into ckan.lib.helpers 'literal', 'link_to', diff --git a/ckan/lib/i18n.py b/ckan/lib/i18n.py index ca6c1682418..0d2d8e49499 100644 --- a/ckan/lib/i18n.py +++ b/ckan/lib/i18n.py @@ -34,7 +34,10 @@ def _get_locales(): locale_order = config.get('ckan.locale_order', '').split() locales = ['en'] - i18n_path = os.path.dirname(ckan.i18n.__file__) + if config.get('ckan.i18n_directory'): + i18n_path = os.path.join(config.get('ckan.i18n_directory'), 'i18n') + else: + i18n_path = os.path.dirname(ckan.i18n.__file__) locales += [l for l in os.listdir(i18n_path) if localedata.exists(l)] assert locale_default in locales, \ diff --git a/ckan/lib/plugins.py b/ckan/lib/plugins.py index 7acc1e39c31..f60b928f434 100644 --- a/ckan/lib/plugins.py +++ b/ckan/lib/plugins.py @@ -192,6 +192,7 @@ def setup_template_variables(self, context, data_dict): c.groups_available = authz_fn(context, data_dict) c.licenses = [('', '')] + base.model.Package.get_license_options() + # CS: bad_spelling ignore 2 lines c.licences = c.licenses deprecate_context_item('licences', 'Use `c.licenses` instead') c.is_sysadmin = ckan.new_authz.is_sysadmin(c.user) diff --git a/ckan/lib/repoze_patch.py b/ckan/lib/repoze_patch.py index 5344ff93ba0..eb6b32ccc86 100644 --- a/ckan/lib/repoze_patch.py +++ b/ckan/lib/repoze_patch.py @@ -2,12 +2,10 @@ from openid.consumer import consumer from openid.extensions import sreg, ax -import ckan.lib.helpers as h - # #1659 fix - logged_out_url prefixed with mount point def get_full_path(path, environ): if path.startswith('/'): - path = h._add_i18n_to_url(path) + path = environ.get('SCRIPT_NAME', '') + path return path def identify(self, environ): @@ -31,8 +29,8 @@ def identify(self, environ): for a,v in self.forget(environ,{}): res.headers.add(a,v) res.status = 302 - - res.location = get_full_path(self.logged_out_url, environ) + url = self.logged_out_url + '?came_from=' + environ.get('came_from') + res.location = get_full_path(url, environ) environ['repoze.who.application'] = res return {} diff --git a/ckan/logic/action/create.py b/ckan/logic/action/create.py index de254f14d3f..20d7db5e922 100644 --- a/ckan/logic/action/create.py +++ b/ckan/logic/action/create.py @@ -3,7 +3,7 @@ import logging from pylons import config -from paste.deploy.converters import asbool +import paste.deploy.converters import ckan.lib.plugins as lib_plugins import ckan.logic as logic @@ -181,7 +181,7 @@ def package_create(context, data_dict): context["package"] = pkg ## this is added so that the rest controller can make a new location context["id"] = pkg.id - log.debug('Created object %s' % str(pkg.name)) + log.debug('Created object %s' % pkg.name) # Make sure that a user provided schema is not used on package_show context.pop('schema', None) @@ -575,7 +575,7 @@ def _group_or_org_create(context, data_dict, is_org=False): } logic.get_action('member_create')(member_create_context, member_dict) - log.debug('Created object %s' % str(group.name)) + log.debug('Created object %s' % group.name) return model_dictize.group_dictize(group, context) @@ -822,7 +822,10 @@ def user_create(context, data_dict): context['user_obj'] = user context['id'] = user.id - log.debug('Created user %s' % str(user.name)) + + model.Dashboard.get(user.id) # Create dashboard for user. + + log.debug('Created user {name}'.format(name=user.name)) return user_dict ## Modifications for rest api @@ -888,7 +891,7 @@ def vocabulary_create(context, data_dict): if not context.get('defer_commit'): model.repo.commit() - log.debug('Created Vocabulary %s' % str(vocabulary.name)) + log.debug('Created Vocabulary %s' % vocabulary.name) return model_dictize.vocabulary_dictize(vocabulary, context) @@ -914,7 +917,8 @@ def activity_create(context, activity_dict, ignore_auth=False): :rtype: dictionary ''' - if not asbool(config.get('ckan.activity_streams_enabled', 'true')): + if not paste.deploy.converters.asbool( + config.get('ckan.activity_streams_enabled', 'true')): return model = context['model'] @@ -1141,10 +1145,41 @@ def _group_or_org_member_create(context, data_dict, is_org=False): logic.get_action('member_create')(member_create_context, member_dict) def group_member_create(context, data_dict): + '''Make a user a member of a group. + + You must be authorized to edit the group. + + :param id: the id or name of the group + :type id: string + :param username: name or id of the user to be made member of the group + :type username: string + :param role: role of the user in the group. One of ``member``, ``editor``, + or ``admin`` + :type role: string + + :returns: the newly created (or updated) membership + :rtype: dictionary + ''' _check_access('group_member_create', context, data_dict) return _group_or_org_member_create(context, data_dict) def organization_member_create(context, data_dict): + '''Make a user a member of an organization. + + You must be authorized to edit the organization. + + :param id: the id or name of the organization + :type id: string + :param username: name or id of the user to be made member of the + organization + :type username: string + :param role: role of the user in the organization. One of ``member``, + ``editor``, or ``admin`` + :type role: string + + :returns: the newly created (or updated) membership + :rtype: dictionary + ''' _check_access('organization_member_create', context, data_dict) return _group_or_org_member_create(context, data_dict, is_org=True) diff --git a/ckan/logic/action/delete.py b/ckan/logic/action/delete.py index fd113498839..c29f17e4d0c 100644 --- a/ckan/logic/action/delete.py +++ b/ckan/logic/action/delete.py @@ -263,7 +263,7 @@ def group_delete(context, data_dict): return _group_or_org_delete(context, data_dict) def organization_delete(context, data_dict): - '''Delete a organization. + '''Delete an organization. You must be authorized to delete the organization. @@ -273,6 +273,86 @@ def organization_delete(context, data_dict): ''' return _group_or_org_delete(context, data_dict, is_org=True) +def _group_or_org_purge(context, data_dict, is_org=False): + '''Purge a group or organization. + + The group or organization will be completely removed from the database. + This cannot be undone! + + Only sysadmins can purge groups or organizations. + + :param id: the name or id of the group or organization to be purged + :type id: string + + :param is_org: you should pass is_org=True if purging an organization, + otherwise False (optional, default: False) + :type is_org: boolean + + ''' + model = context['model'] + id = _get_or_bust(data_dict, 'id') + + group = model.Group.get(id) + context['group'] = group + if group is None: + if is_org: + raise NotFound('Organization was not found') + else: + raise NotFound('Group was not found') + + if is_org: + _check_access('organization_purge', context, data_dict) + else: + _check_access('group_purge', context, data_dict) + + members = model.Session.query(model.Member) + members = members.filter(model.Member.group_id == group.id) + if members.count() > 0: + model.repo.new_revision() + for m in members.all(): + m.delete() + model.repo.commit_and_remove() + + group = model.Group.get(id) + model.repo.new_revision() + group.purge() + model.repo.commit_and_remove() + +def group_purge(context, data_dict): + '''Purge a group. + + .. warning:: Purging a group cannot be undone! + + Purging a group completely removes the group from the CKAN database, + whereas deleting a group simply marks the group as deleted (it will no + longer show up in the frontend, but is still in the db). + + You must be authorized to purge the group. + + :param id: the name or id of the group to be purged + :type id: string + + ''' + return _group_or_org_purge(context, data_dict, is_org=False) + +def organization_purge(context, data_dict): + '''Purge an organization. + + .. warning:: Purging an organization cannot be undone! + + Purging an organization completely removes the organization from the CKAN + database, whereas deleting an organization simply marks the organization as + deleted (it will no longer show up in the frontend, but is still in the + db). + + You must be authorized to purge the organization. + + :param id: the name or id of the organization to be purged + :type id: string + + ''' + return _group_or_org_purge(context, data_dict, is_org=True) + def task_status_delete(context, data_dict): '''Delete a task status. @@ -419,7 +499,8 @@ def _group_or_org_member_delete(context, data_dict=None): group_id = data_dict.get('id') group = model.Group.get(group_id) - user_id = data_dict.get('user_id') + user_id = data_dict.get('username') + user_id = data_dict.get('user_id') if user_id is None else user_id member_dict = { 'id': group.id, 'object': user_id, @@ -434,9 +515,29 @@ def _group_or_org_member_delete(context, data_dict=None): def group_member_delete(context, data_dict=None): + '''Remove a user from a group. + + You must be authorized to edit the group. + + :param id: the id or name of the group + :type id: string + :param username: name or id of the user to be removed + :type username: string + + ''' return _group_or_org_member_delete(context, data_dict) def organization_member_delete(context, data_dict=None): + '''Remove a user from an organization. + + You must be authorized to edit the organization. + + :param id: the id or name of the organization + :type id: string + :param username: name or id of the user to be removed + :type username: string + + ''' return _group_or_org_member_delete(context, data_dict) diff --git a/ckan/logic/action/get.py b/ckan/logic/action/get.py index cab9eb0c058..829b6cc5f65 100644 --- a/ckan/logic/action/get.py +++ b/ckan/logic/action/get.py @@ -69,16 +69,17 @@ def package_list(context, data_dict): ''' model = context["model"] api = context.get("api_version", 1) - ref_package_by = 'id' if api == 2 else 'name' _check_access('package_list', context, data_dict) - query = model.Session.query(model.PackageRevision) - query = query.filter(model.PackageRevision.state=='active') - query = query.filter(model.PackageRevision.current==True) - - packages = query.all() - return [getattr(p, ref_package_by) for p in packages] + package_revision_table = model.package_revision_table + col = (package_revision_table.c.id + if api == 2 else package_revision_table.c.name) + query = _select([col]) + query = query.where(_and_(package_revision_table.c.state=='active', + package_revision_table.c.current==True)) + query = query.order_by(col) + return list(zip(*query.execute())[0]) def current_package_list_with_resources(context, data_dict): '''Return a list of the site's datasets (packages) and their resources. @@ -417,13 +418,20 @@ def group_list_authz(context, data_dict): (optional, default: ``False``) :type available_only: boolean + :param am_member: if True return only the groups the logged-in user is a + member of, otherwise return all groups that the user is authorized to + edit (for example, sysadmin users are authorized to edit all groups) + (optional, default: False) + :type am-member: boolean + :returns: the names of groups that the user is authorized to edit :rtype: list of strings ''' model = context['model'] user = context['user'] - available_only = data_dict.get('available_only',False) + available_only = data_dict.get('available_only', False) + am_member = data_dict.get('am_member', False) _check_access('group_list_authz',context, data_dict) @@ -435,7 +443,7 @@ def group_list_authz(context, data_dict): if not user_id: return [] - if not sysadmin: + if not sysadmin or am_member: q = model.Session.query(model.Member) \ .filter(model.Member.table_name == 'user') \ .filter(model.Member.capacity.in_(roles)) \ @@ -451,7 +459,7 @@ def group_list_authz(context, data_dict): .filter(model.Group.is_organization == False) \ .filter(model.Group.state == 'active') - if not sysadmin: + if not sysadmin or am_member: q = q.filter(model.Group.id.in_(group_ids)) groups = q.all() @@ -461,7 +469,10 @@ def group_list_authz(context, data_dict): if package: groups = set(groups) - set(package.get_groups()) - return [{'id':group.id,'name':group.name} for group in groups] + return [{'id': group.id, + 'name': group.name, + 'display_name': group.display_name, + 'type': group.type} for group in groups] def organization_list_for_user(context, data_dict): '''Return the list of organizations that the user is a member of. @@ -484,35 +495,38 @@ def organization_list_for_user(context, data_dict): .filter(model.Group.is_organization == True) \ .filter(model.Group.state == 'active') - if sysadmin: - # Sysadmins can see all organizations - return [{'id':org.id,'name':org.name,'title':org.title} for org in orgs_q.all()] + if not sysadmin: + # for non-Sysadmins check they have the required permission - permission = data_dict.get('permission', 'edit_group') + permission = data_dict.get('permission', 'edit_group') - roles = ckan.new_authz.get_roles_with_permission(permission) + roles = ckan.new_authz.get_roles_with_permission(permission) - if not roles: - return [] - user_id = new_authz.get_user_id_for_username(user, allow_none=True) - if not user_id: - return [] + if not roles: + return [] + user_id = new_authz.get_user_id_for_username(user, allow_none=True) + if not user_id: + return [] - q = model.Session.query(model.Member) \ - .filter(model.Member.table_name == 'user') \ - .filter(model.Member.capacity.in_(roles)) \ - .filter(model.Member.table_id == user_id) + q = model.Session.query(model.Member) \ + .filter(model.Member.table_name == 'user') \ + .filter(model.Member.capacity.in_(roles)) \ + .filter(model.Member.table_id == user_id) - group_ids = [] - for row in q.all(): - group_ids.append(row.group_id) + group_ids = [] + for row in q.all(): + group_ids.append(row.group_id) - if not group_ids: - return [] + if not group_ids: + return [] - q = orgs_q.filter(model.Group.id.in_(group_ids)) + orgs_q = orgs_q.filter(model.Group.id.in_(group_ids)) - return [{'id':org.id,'name':org.name,'title':org.title} for org in q.all()] + return [{'id': org.id, + 'name': org.name, + 'title': org.title, + 'display_name': org.display_name, + 'type': org.type} for org in orgs_q.all()] def group_revision_list(context, data_dict): '''Return a group's revisions. @@ -670,12 +684,13 @@ def user_list(context, data_dict): def package_relationships_list(context, data_dict): '''Return a dataset (package)'s relationships. - :param id: the id or name of the package + :param id: the id or name of the first package :type id: string - :param id2: - :type id2: - :param rel: - :type rel: + :param id2: the id or name of the second package + :type id: string + :param rel: relationship as string see + :func:`ckan.logic.action.create.package_relationship_create()` for the + relationship types (optional) :rtype: list of dictionaries @@ -756,6 +771,7 @@ def package_show(context, data_dict): return package_dict + def resource_show(context, data_dict): '''Return the metadata of a resource. @@ -2798,4 +2814,12 @@ def _unpick_search(sort, allowed_fields=None, total=None): def member_roles_list(context, data_dict): + '''Return the possible roles for members of groups and organizations. + + :returns: a list of dictionaries each with two keys: "text" (the display + name of the role, e.g. "Admin") and "value" (the internal name of the + role, e.g. "admin") + :rtype: list of dictionaries + + ''' return new_authz.roles_list() diff --git a/ckan/logic/action/update.py b/ckan/logic/action/update.py index ad90f86fab5..889bfe5ad4e 100644 --- a/ckan/logic/action/update.py +++ b/ckan/logic/action/update.py @@ -207,31 +207,26 @@ def resource_update(context, data_dict): raise NotFound(_('Resource was not found.')) _check_access('resource_update', context, data_dict) + del context["resource"] - if 'schema' in context: - schema = context['schema'] - else: - package_plugin = lib_plugins.lookup_package_plugin( - resource.resource_group.package.type) - schema = package_plugin.update_package_schema()['resources'] - - data, errors = _validate(data_dict, schema, context) - if errors: - model.Session.rollback() - raise ValidationError(errors) + package_id = resource.resource_group.package.id + pkg_dict = _get_action('package_show')(context, {'id': package_id}) - rev = model.repo.new_revision() - rev.author = user - if 'message' in context: - rev.message = context['message'] + for n, p in enumerate(pkg_dict['resources']): + if p['id'] == id: + break else: - rev.message = _(u'REST API: Update object %s') % data.get("name", "") + logging.error('Could not find resource ' + id) + raise NotFound(_('Resource was not found.')) + pkg_dict['resources'][n] = data_dict - resource = model_save.resource_dict_save(data, context) - if not context.get('defer_commit'): - model.repo.commit() - return model_dictize.resource_dictize(resource, context) + try: + pkg_dict = _get_action('package_update')(context, pkg_dict) + except ValidationError, e: + errors = e.error_dict['resources'][n] + raise ValidationError(errors) + return pkg_dict['resources'][n] def package_update(context, data_dict): @@ -321,7 +316,7 @@ def package_update(context, data_dict): if not context.get('defer_commit'): model.repo.commit() - log.debug('Updated object %s' % str(pkg.name)) + log.debug('Updated object %s' % pkg.name) return_id_only = context.get('return_id_only', False) @@ -764,11 +759,10 @@ def term_translation_update_many(context, data_dict): ''' model = context['model'] - - if not data_dict.get('data') and isinstance(data_dict, list): + if not (data_dict.get('data') and isinstance(data_dict.get('data'), list)): raise ValidationError( - {'error': - 'term_translation_update_many needs to have a list of dicts in field data'} + {'error': 'term_translation_update_many needs to have a ' + 'list of dicts in field data'} ) context['defer_commit'] = True diff --git a/ckan/logic/auth/create.py b/ckan/logic/auth/create.py index 1baf9b61077..bf9c3d17ea3 100644 --- a/ckan/logic/auth/create.py +++ b/ckan/logic/auth/create.py @@ -4,24 +4,32 @@ from ckan.common import _ +@logic.auth_sysadmins_check def package_create(context, data_dict=None): user = context['user'] if not new_authz.auth_is_registered_user(): check1 = new_authz.check_config_permission('anon_create_dataset') else: check1 = new_authz.check_config_permission('create_dataset_if_not_in_organization') \ + or new_authz.check_config_permission('create_unowned_dataset') \ or new_authz.has_user_permission_for_some_org(user, 'create_dataset') if not check1: return {'success': False, 'msg': _('User %s not authorized to create packages') % user} - else: - check2 = _check_group_auth(context,data_dict) - if not check2: - return {'success': False, 'msg': _('User %s not authorized to edit these groups') % str(user)} + check2 = _check_group_auth(context,data_dict) + if not check2: + return {'success': False, 'msg': _('User %s not authorized to edit these groups') % user} + # If an organization is given are we able to add a dataset to it? + data_dict = data_dict or {} + org_id = data_dict.get('organization_id') + if org_id and not new_authz.has_user_permission_for_group_or_org( + org_id, user, 'create_dataset'): + return {'success': False, 'msg': _('User %s not authorized to add dataset to this organization') % user} return {'success': True} + def file_upload(context, data_dict=None): user = context['user'] if not new_authz.auth_is_registered_user(): diff --git a/ckan/logic/auth/delete.py b/ckan/logic/auth/delete.py index 4ccd7acc693..61b44697407 100644 --- a/ckan/logic/auth/delete.py +++ b/ckan/logic/auth/delete.py @@ -10,7 +10,7 @@ def package_delete(context, data_dict): authorized = new_authz.has_user_permission_for_group_or_org(package.owner_org, user, 'delete_dataset') if not authorized: - return {'success': False, 'msg': _('User %s not authorized to delete package %s') % (str(user),package.id)} + return {'success': False, 'msg': _('User %s not authorized to delete package %s') % (user, package.id)} else: return {'success': True} @@ -32,7 +32,7 @@ def resource_delete(context, data_dict): authorized = package_delete(context, pkg_dict).get('success') if not authorized: - return {'success': False, 'msg': _('User %s not authorized to delete resource %s') % (str(user), resource.id)} + return {'success': False, 'msg': _('User %s not authorized to delete resource %s') % (user, resource.id)} else: return {'success': True} @@ -84,6 +84,14 @@ def group_delete(context, data_dict): else: return {'success': True} +def group_purge(context, data_dict): + # Only sysadmins are authorized to purge groups. + return {'success': False} + +def organization_purge(context, data_dict): + # Only sysadmins are authorized to purge organizations. + return {'success': False} + def organization_delete(context, data_dict): group = get_group_object(context, data_dict) user = context['user'] @@ -122,7 +130,7 @@ def _group_or_org_member_delete(context, data_dict): authorized = new_authz.has_user_permission_for_group_or_org( group.id, user, 'delete_member') if not authorized: - return {'success': False, 'msg': _('User %s not authorized to delete organization %s members') % (str(user),group.id)} + return {'success': False, 'msg': _('User %s not authorized to delete organization %s members') % (user, group.id)} else: return {'success': True} return {'success': True} diff --git a/ckan/logic/auth/get.py b/ckan/logic/auth/get.py index a088289f819..f0f27d74764 100644 --- a/ckan/logic/auth/get.py +++ b/ckan/logic/auth/get.py @@ -100,6 +100,8 @@ def package_show(context, data_dict): auth = new_authz.is_authorized('package_update', context, data_dict) authorized = auth.get('success') + elif package.owner_org is None and package.state == 'active': + return {'success': True} else: # anyone can see a public package if not package.private and package.state == 'active': @@ -133,7 +135,7 @@ def resource_show(context, data_dict): authorized = package_show(context, pkg_dict).get('success') if not authorized: - return {'success': False, 'msg': _('User %s not authorized to read resource %s') % (str(user), resource.id)} + return {'success': False, 'msg': _('User %s not authorized to read resource %s') % (user, resource.id)} else: return {'success': True} diff --git a/ckan/logic/schema.py b/ckan/logic/schema.py index c153eee84a2..a6fb7eaca79 100644 --- a/ckan/logic/schema.py +++ b/ckan/logic/schema.py @@ -48,7 +48,9 @@ user_name_exists, role_exists, url_validator, - list_of_strings) + datasets_with_no_organization_cannot_be_private, + list_of_strings, + ) from ckan.logic.converters import (convert_user_name_or_id_to_id, convert_package_name_or_id_to_id, convert_group_name_or_id_to_id,) @@ -137,7 +139,8 @@ def default_create_package_schema(): 'type': [ignore_missing, unicode], 'owner_org': [owner_org_validator, unicode], 'log_message': [ignore_missing, unicode, no_http], - 'private': [ignore_missing, boolean_validator], + 'private': [ignore_missing, boolean_validator, + datasets_with_no_organization_cannot_be_private], '__extras': [ignore], '__junk': [empty], 'resources': default_resource_schema(), diff --git a/ckan/logic/validators.py b/ckan/logic/validators.py index 0a3b2805e9f..f9de157795c 100644 --- a/ckan/logic/validators.py +++ b/ckan/logic/validators.py @@ -110,7 +110,7 @@ def package_name_exists(value, context): result = session.query(model.Package).filter_by(name=value).first() if not result: - raise Invalid(_('Not found') + ': %r' % str(value)) + raise Invalid(_('Not found') + ': %s' % value) return value def package_id_or_name_exists(package_id_or_name, context): @@ -267,7 +267,7 @@ def object_id_validator(key, activity_dict, errors, context): return object_id_validators[activity_type](object_id, context) else: raise Invalid('There is no object_id validator for ' - 'activity type "%s"' % str(activity_type)) + 'activity type "%s"' % activity_type) def extras_unicode_convert(extras, context): for extra in extras: @@ -632,6 +632,13 @@ def role_exists(role, context): return role +def datasets_with_no_organization_cannot_be_private(key, data, errors, + context): + if data[key] is True and data.get(('owner_org',)) is None: + errors[key].append( + _("Datasets with no organization can't be private.")) + + def list_of_strings(key, data, errors, context): value = data.get(key) if not isinstance(value, list): @@ -639,3 +646,4 @@ def list_of_strings(key, data, errors, context): for x in value: if not isinstance(x, basestring): raise Invalid('%s: %s' % (_('Not a string'), x)) + diff --git a/ckan/migration/versions/066_default_package_type.py b/ckan/migration/versions/066_default_package_type.py index c91eb18e122..9190b941d90 100644 --- a/ckan/migration/versions/066_default_package_type.py +++ b/ckan/migration/versions/066_default_package_type.py @@ -1,4 +1,3 @@ - def upgrade(migrate_engine): update_statement = ''' diff --git a/ckan/model/license.py b/ckan/model/license.py index 1b65d6040ec..f828edcae69 100644 --- a/ckan/model/license.py +++ b/ckan/model/license.py @@ -184,7 +184,7 @@ class LicenseOpenDataCommonsPDDL(DefaultLicense): @property def title(self): - return _("Open Data Commons Public Domain Dedication and Licence (PDDL)") + return _("Open Data Commons Public Domain Dedication and License (PDDL)") class LicenseOpenDataCommonsOpenDatabase(DefaultLicense): domain_data = True @@ -279,10 +279,12 @@ class LicenseOpenGovernment(DefaultLicense): domain_content = True id = "uk-ogl" is_okd_compliant = True + # CS: bad_spelling ignore url = "http://reference.data.gov.uk/id/open-government-licence" @property def title(self): + # CS: bad_spelling ignore return _("UK Open Government Licence (OGL)") class LicenseCreativeCommonsNonCommercial(DefaultLicense): diff --git a/ckan/new_authz.py b/ckan/new_authz.py index 4552a518a75..1d391c50900 100644 --- a/ckan/new_authz.py +++ b/ckan/new_authz.py @@ -23,6 +23,7 @@ def clear_auth_functions_cache(): def clean_action_name(action_name): ''' Used to convert old style action names into new style ones ''' new_action_name = re.sub('package', 'dataset', action_name) + # CS: bad_spelling ignore return re.sub('licence', 'license', new_action_name) diff --git a/ckan/plugins/interfaces.py b/ckan/plugins/interfaces.py index a37d3c96ae8..8acfc34aad6 100644 --- a/ckan/plugins/interfaces.py +++ b/ckan/plugins/interfaces.py @@ -202,8 +202,20 @@ class IResourcePreview(Interface): def can_preview(self, data_dict): ''' - Return True if the extension can preview the resource. The ``data_dict`` - contains the resource and the package. + Returns info on whether the plugin can preview the resource. + + This can be done in two ways. + The old way is to just return True or False. + The new way is to return a dict with the following + { + 'can_preview': bool - if the extension can preview the resource + 'fixable': string - if the extension cannot preview but could for + example if the resource_proxy was enabled. + 'quality': int - how good the preview is 1-poor, 2-average, 3-good + used if multiple extensions can preview + } + + The ``data_dict`` contains the resource and the package. Make sure to ckeck the ``on_same_domain`` value of the resource or the url if your preview requires the resource to be on diff --git a/ckan/public/base/css/fuchsia.css b/ckan/public/base/css/fuchsia.css index 54db663e9d3..300d2981817 100644 --- a/ckan/public/base/css/fuchsia.css +++ b/ckan/public/base/css/fuchsia.css @@ -48,11 +48,25 @@ sub { bottom: -0.25em; } img { + /* Responsive images (ensure images don't scale beyond their parents) */ + max-width: 100%; + /* Part 1: Set a maxium relative to the parent */ + + width: auto\9; + /* IE7-8 need help adjusting responsive images */ + + height: auto; + /* Part 2: Scale the height according to the width, otherwise you get stretching */ + vertical-align: middle; border: 0; -ms-interpolation-mode: bicubic; } +#map_canvas img, +.google-maps img { + max-width: none; +} button, input, select, @@ -72,11 +86,21 @@ input::-moz-focus-inner { border: 0; } button, -input[type="button"], +html input[type="button"], input[type="reset"], input[type="submit"] { - cursor: pointer; -webkit-appearance: button; + cursor: pointer; +} +label, +select, +button, +input[type="button"], +input[type="reset"], +input[type="submit"], +input[type="radio"], +input[type="checkbox"] { + cursor: pointer; } input[type="search"] { -webkit-box-sizing: content-box; @@ -92,6 +116,57 @@ textarea { overflow: auto; vertical-align: top; } +@media print { + * { + text-shadow: none !important; + color: #000 !important; + background: transparent !important; + box-shadow: none !important; + } + a, + a:visited { + text-decoration: underline; + } + a[href]:after { + content: " (" attr(href) ")"; + } + abbr[title]:after { + content: " (" attr(title) ")"; + } + .ir a:after, + a[href^="javascript:"]:after, + a[href^="#"]:after { + content: ""; + } + pre, + blockquote { + border: 1px solid #999; + page-break-inside: avoid; + } + thead { + display: table-header-group; + } + tr, + img { + page-break-inside: avoid; + } + img { + max-width: 100% !important; + } + @page { + margin: 0.5cm; + } + p, + h2, + h3 { + orphans: 3; + widows: 3; + } + h2, + h3 { + page-break-after: avoid; + } +} .clearfix { *zoom: 1; } @@ -99,6 +174,7 @@ textarea { .clearfix:after { display: table; content: ""; + line-height: 0; } .clearfix:after { clear: both; @@ -113,28 +189,47 @@ textarea { .input-block-level { display: block; width: 100%; - min-height: 28px; + min-height: 30px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; } body { margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; - color: #4d4d4d; - background-color: #efefef; + font-size: 14px; + line-height: 20px; + color: #444444; + background-color: #eeeeee; } a { - color: #b509b5; + color: #e73892; text-decoration: none; } -a:hover { - color: #6c056c; +a:hover, +a:focus { + color: #bc176c; text-decoration: underline; } +.img-rounded { + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.img-polaroid { + padding: 4px; + background-color: #fff; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); +} +.img-circle { + -webkit-border-radius: 500px; + -moz-border-radius: 500px; + border-radius: 500px; +} .row { margin-left: -20px; *zoom: 1; @@ -143,15 +238,18 @@ a:hover { .row:after { display: table; content: ""; + line-height: 0; } .row:after { clear: both; } [class*="span"] { float: left; + min-height: 1px; margin-left: 20px; } .container, +.navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 940px; @@ -236,6 +334,7 @@ a:hover { .row-fluid:after { display: table; content: ""; + line-height: 0; } .row-fluid:after { clear: both; @@ -243,65 +342,171 @@ a:hover { .row-fluid [class*="span"] { display: block; width: 100%; - min-height: 28px; + min-height: 30px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; float: left; - margin-left: 2.127659574%; - *margin-left: 2.0744680846382977%; + margin-left: 2.127659574468085%; + *margin-left: 2.074468085106383%; } .row-fluid [class*="span"]:first-child { margin-left: 0; } +.row-fluid .controls-row [class*="span"] + [class*="span"] { + margin-left: 2.127659574468085%; +} .row-fluid .span12 { - width: 99.99999998999999%; - *width: 99.94680850063828%; + width: 100%; + *width: 99.94680851063829%; } .row-fluid .span11 { - width: 91.489361693%; - *width: 91.4361702036383%; + width: 91.48936170212765%; + *width: 91.43617021276594%; } .row-fluid .span10 { - width: 82.97872339599999%; - *width: 82.92553190663828%; + width: 82.97872340425532%; + *width: 82.92553191489361%; } .row-fluid .span9 { - width: 74.468085099%; - *width: 74.4148936096383%; + width: 74.46808510638297%; + *width: 74.41489361702126%; } .row-fluid .span8 { - width: 65.95744680199999%; - *width: 65.90425531263828%; + width: 65.95744680851064%; + *width: 65.90425531914893%; } .row-fluid .span7 { - width: 57.446808505%; - *width: 57.3936170156383%; + width: 57.44680851063829%; + *width: 57.39361702127659%; } .row-fluid .span6 { - width: 48.93617020799999%; - *width: 48.88297871863829%; + width: 48.93617021276595%; + *width: 48.88297872340425%; } .row-fluid .span5 { - width: 40.425531911%; - *width: 40.3723404216383%; + width: 40.42553191489362%; + *width: 40.37234042553192%; } .row-fluid .span4 { - width: 31.914893614%; - *width: 31.8617021246383%; + width: 31.914893617021278%; + *width: 31.861702127659576%; } .row-fluid .span3 { - width: 23.404255317%; - *width: 23.3510638276383%; + width: 23.404255319148934%; + *width: 23.351063829787233%; } .row-fluid .span2 { - width: 14.89361702%; - *width: 14.8404255306383%; + width: 14.893617021276595%; + *width: 14.840425531914894%; } .row-fluid .span1 { - width: 6.382978723%; - *width: 6.329787233638298%; + width: 6.382978723404255%; + *width: 6.329787234042553%; +} +.row-fluid .offset12 { + margin-left: 104.25531914893617%; + *margin-left: 104.14893617021275%; +} +.row-fluid .offset12:first-child { + margin-left: 102.12765957446808%; + *margin-left: 102.02127659574467%; +} +.row-fluid .offset11 { + margin-left: 95.74468085106382%; + *margin-left: 95.6382978723404%; +} +.row-fluid .offset11:first-child { + margin-left: 93.61702127659574%; + *margin-left: 93.51063829787232%; +} +.row-fluid .offset10 { + margin-left: 87.23404255319149%; + *margin-left: 87.12765957446807%; +} +.row-fluid .offset10:first-child { + margin-left: 85.1063829787234%; + *margin-left: 84.99999999999999%; +} +.row-fluid .offset9 { + margin-left: 78.72340425531914%; + *margin-left: 78.61702127659572%; +} +.row-fluid .offset9:first-child { + margin-left: 76.59574468085106%; + *margin-left: 76.48936170212764%; +} +.row-fluid .offset8 { + margin-left: 70.2127659574468%; + *margin-left: 70.10638297872339%; +} +.row-fluid .offset8:first-child { + margin-left: 68.08510638297872%; + *margin-left: 67.9787234042553%; +} +.row-fluid .offset7 { + margin-left: 61.70212765957446%; + *margin-left: 61.59574468085106%; +} +.row-fluid .offset7:first-child { + margin-left: 59.574468085106375%; + *margin-left: 59.46808510638297%; +} +.row-fluid .offset6 { + margin-left: 53.191489361702125%; + *margin-left: 53.085106382978715%; +} +.row-fluid .offset6:first-child { + margin-left: 51.063829787234035%; + *margin-left: 50.95744680851063%; +} +.row-fluid .offset5 { + margin-left: 44.68085106382979%; + *margin-left: 44.57446808510638%; +} +.row-fluid .offset5:first-child { + margin-left: 42.5531914893617%; + *margin-left: 42.4468085106383%; +} +.row-fluid .offset4 { + margin-left: 36.170212765957444%; + *margin-left: 36.06382978723405%; +} +.row-fluid .offset4:first-child { + margin-left: 34.04255319148936%; + *margin-left: 33.93617021276596%; +} +.row-fluid .offset3 { + margin-left: 27.659574468085104%; + *margin-left: 27.5531914893617%; +} +.row-fluid .offset3:first-child { + margin-left: 25.53191489361702%; + *margin-left: 25.425531914893618%; +} +.row-fluid .offset2 { + margin-left: 19.148936170212764%; + *margin-left: 19.04255319148936%; +} +.row-fluid .offset2:first-child { + margin-left: 17.02127659574468%; + *margin-left: 16.914893617021278%; +} +.row-fluid .offset1 { + margin-left: 10.638297872340425%; + *margin-left: 10.53191489361702%; +} +.row-fluid .offset1:first-child { + margin-left: 8.51063829787234%; + *margin-left: 8.404255319148938%; +} +[class*="span"].hide, +.row-fluid [class*="span"].hide { + display: none; +} +[class*="span"].pull-right, +.row-fluid [class*="span"].pull-right { + float: right; } .container { margin-right: auto; @@ -312,6 +517,7 @@ a:hover { .container:after { display: table; content: ""; + line-height: 0; } .container:after { clear: both; @@ -325,25 +531,75 @@ a:hover { .container-fluid:after { display: table; content: ""; + line-height: 0; } .container-fluid:after { clear: both; } p { - margin: 0 0 9px; - font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; -} -p small { - font-size: 11px; - color: #999999; + margin: 0 0 10px; } .lead { - margin-bottom: 18px; - font-size: 20px; + margin-bottom: 20px; + font-size: 21px; font-weight: 200; - line-height: 27px; + line-height: 30px; +} +small { + font-size: 85%; +} +strong { + font-weight: bold; +} +em { + font-style: italic; +} +cite { + font-style: normal; +} +.muted { + color: #999999; +} +a.muted:hover, +a.muted:focus { + color: #808080; +} +.text-warning { + color: #c09853; +} +a.text-warning:hover, +a.text-warning:focus { + color: #a47e3c; +} +.text-error { + color: #b55457; +} +a.text-error:hover, +a.text-error:focus { + color: #954143; +} +.text-info { + color: #3a87ad; +} +a.text-info:hover, +a.text-info:focus { + color: #2d6987; +} +.text-success { + color: #468847; +} +a.text-success:hover, +a.text-success:focus { + color: #356635; +} +.text-left { + text-align: left; +} +.text-right { + text-align: right; +} +.text-center { + text-align: center; } h1, h2, @@ -351,9 +607,10 @@ h3, h4, h5, h6 { - margin: 0; + margin: 10px 0; font-family: inherit; font-weight: bold; + line-height: 20px; color: inherit; text-rendering: optimizelegibility; } @@ -364,60 +621,53 @@ h4 small, h5 small, h6 small { font-weight: normal; + line-height: 1; color: #999999; } -h1 { - font-size: 30px; - line-height: 36px; +h1, +h2, +h3 { + line-height: 40px; } -h1 small { - font-size: 18px; +h1 { + font-size: 38.5px; } h2 { - font-size: 24px; - line-height: 36px; -} -h2 small { - font-size: 18px; + font-size: 31.5px; } h3 { - font-size: 18px; - line-height: 27px; + font-size: 24.5px; } -h3 small { +h4 { + font-size: 17.5px; +} +h5 { font-size: 14px; } -h4, -h5, h6 { - line-height: 18px; + font-size: 11.9px; } -h4 { - font-size: 14px; +h1 small { + font-size: 24.5px; } -h4 small { - font-size: 12px; +h2 small { + font-size: 17.5px; } -h5 { - font-size: 12px; +h3 small { + font-size: 14px; } -h6 { - font-size: 11px; - color: #999999; - text-transform: uppercase; +h4 small { + font-size: 14px; } .page-header { - padding-bottom: 17px; - margin: 18px 0; + padding-bottom: 9px; + margin: 20px 0 30px; border-bottom: 1px solid #eeeeee; } -.page-header h1 { - line-height: 1; -} ul, ol { padding: 0; - margin: 0 0 9px 25px; + margin: 0 0 10px 25px; } ul ul, ul ol, @@ -425,37 +675,57 @@ ol ol, ol ul { margin-bottom: 0; } -ul { - list-style: disc; -} -ol { - list-style: decimal; -} li { - line-height: 18px; + line-height: 20px; } ul.unstyled, ol.unstyled { margin-left: 0; list-style: none; } +ul.inline, +ol.inline { + margin-left: 0; + list-style: none; +} +ul.inline > li, +ol.inline > li { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + padding-left: 5px; + padding-right: 5px; +} dl { - margin-bottom: 18px; + margin-bottom: 20px; } dt, dd { - line-height: 18px; + line-height: 20px; } dt { font-weight: bold; - line-height: 17px; } dd { - margin-left: 9px; + margin-left: 10px; +} +.dl-horizontal { + *zoom: 1; +} +.dl-horizontal:before, +.dl-horizontal:after { + display: table; + content: ""; + line-height: 0; +} +.dl-horizontal:after { + clear: both; } .dl-horizontal dt { float: left; - width: 120px; + width: 160px; clear: left; text-align: right; overflow: hidden; @@ -463,26 +733,18 @@ dd { white-space: nowrap; } .dl-horizontal dd { - margin-left: 130px; + margin-left: 180px; } hr { - margin: 18px 0; + margin: 20px 0; border: 0; border-top: 1px solid #eeeeee; border-bottom: 1px solid #ffffff; } -strong { - font-weight: bold; -} -em { - font-style: italic; -} -.muted { - color: #999999; -} -abbr[title] { +abbr[title], +abbr[data-original-title] { cursor: help; - border-bottom: 1px dotted #ddd; + border-bottom: 1px dotted #999999; } abbr.initialism { font-size: 90%; @@ -490,18 +752,18 @@ abbr.initialism { } blockquote { padding: 0 0 0 15px; - margin: 0 0 18px; + margin: 0 0 20px; border-left: 5px solid #eeeeee; } blockquote p { margin-bottom: 0; - font-size: 16px; + font-size: 17.5px; font-weight: 300; - line-height: 22.5px; + line-height: 1.25; } blockquote small { display: block; - line-height: 18px; + line-height: 20px; color: #999999; } blockquote small:before { @@ -518,6 +780,12 @@ blockquote.pull-right p, blockquote.pull-right small { text-align: right; } +blockquote.pull-right small:before { + content: ''; +} +blockquote.pull-right small:after { + content: '\00A0 \2014'; +} q:before, q:after, blockquote:before, @@ -526,20 +794,14 @@ blockquote:after { } address { display: block; - margin-bottom: 18px; - font-style: normal; - line-height: 18px; -} -small { - font-size: 100%; -} -cite { + margin-bottom: 20px; font-style: normal; + line-height: 20px; } code, pre { padding: 0 3px 2px; - font-family: Menlo, Monaco, Consolas, "Courier New", monospace; + font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 12px; color: #333333; -webkit-border-radius: 3px; @@ -551,13 +813,14 @@ code { color: #d14; background-color: #f7f7f9; border: 1px solid #e1e1e8; + white-space: nowrap; } pre { display: block; - padding: 8.5px; - margin: 0 0 9px; - font-size: 12.025px; - line-height: 18px; + padding: 9.5px; + margin: 0 0 10px; + font-size: 13px; + line-height: 20px; word-break: break-all; word-wrap: break-word; white-space: pre; @@ -570,11 +833,13 @@ pre { border-radius: 4px; } pre.prettyprint { - margin-bottom: 18px; + margin-bottom: 20px; } pre code { padding: 0; color: inherit; + white-space: pre; + white-space: pre-wrap; background-color: transparent; border: 0; } @@ -583,7 +848,7 @@ pre code { overflow-y: scroll; } form { - margin: 0 0 18px; + margin: 0 0 20px; } fieldset { padding: 0; @@ -594,15 +859,15 @@ legend { display: block; width: 100%; padding: 0; - margin-bottom: 27px; - font-size: 19.5px; - line-height: 36px; + margin-bottom: 20px; + font-size: 21px; + line-height: 40px; color: #333333; border: 0; - border-bottom: 1px solid #eee; + border-bottom: 1px solid #e5e5e5; } legend small { - font-size: 13.5px; + font-size: 15px; color: #999999; } label, @@ -610,9 +875,9 @@ input, button, select, textarea { - font-size: 13px; + font-size: 14px; font-weight: normal; - line-height: 18px; + line-height: 20px; } input, button, @@ -623,116 +888,181 @@ textarea { label { display: block; margin-bottom: 5px; - color: #333333; } -input, -textarea, select, +textarea, +input[type="text"], +input[type="password"], +input[type="datetime"], +input[type="datetime-local"], +input[type="date"], +input[type="month"], +input[type="time"], +input[type="week"], +input[type="number"], +input[type="email"], +input[type="url"], +input[type="search"], +input[type="tel"], +input[type="color"], .uneditable-input { display: inline-block; - width: 210px; - height: 18px; - padding: 4px; - margin-bottom: 9px; - font-size: 13px; - line-height: 18px; + height: 20px; + padding: 4px 6px; + margin-bottom: 10px; + font-size: 14px; + line-height: 20px; color: #555555; - background-color: #ffffff; - border: 1px solid #cccccc; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + vertical-align: middle; } -.uneditable-textarea { - width: auto; - height: auto; -} -label input, -label textarea, -label select { - display: block; +input, +textarea, +.uneditable-input { + width: 206px; } -input[type="image"], -input[type="checkbox"], -input[type="radio"] { - width: auto; +textarea { height: auto; - padding: 0; - margin: 3px 0; +} +textarea, +input[type="text"], +input[type="password"], +input[type="datetime"], +input[type="datetime-local"], +input[type="date"], +input[type="month"], +input[type="time"], +input[type="week"], +input[type="number"], +input[type="email"], +input[type="url"], +input[type="search"], +input[type="tel"], +input[type="color"], +.uneditable-input { + background-color: #ffffff; + border: 1px solid #cccccc; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border linear .2s, box-shadow linear .2s; + -moz-transition: border linear .2s, box-shadow linear .2s; + -o-transition: border linear .2s, box-shadow linear .2s; + transition: border linear .2s, box-shadow linear .2s; +} +textarea:focus, +input[type="text"]:focus, +input[type="password"]:focus, +input[type="datetime"]:focus, +input[type="datetime-local"]:focus, +input[type="date"]:focus, +input[type="month"]:focus, +input[type="time"]:focus, +input[type="week"]:focus, +input[type="number"]:focus, +input[type="email"]:focus, +input[type="url"]:focus, +input[type="search"]:focus, +input[type="tel"]:focus, +input[type="color"]:focus, +.uneditable-input:focus { + border-color: rgba(82, 168, 236, 0.8); + outline: 0; + outline: thin dotted \9; + /* IE6-9 */ + + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); +} +input[type="radio"], +input[type="checkbox"] { + margin: 4px 0 0; *margin-top: 0; /* IE7 */ - line-height: normal; - cursor: pointer; - background-color: transparent; - border: 0 \9; - /* IE9 and down */ + margin-top: 1px \9; + /* IE8-9 */ - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -input[type="image"] { - border: 0; -} -input[type="file"] { - width: auto; - padding: initial; - line-height: initial; - background-color: #ffffff; - background-color: initial; - border: initial; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; + line-height: normal; } -input[type="button"], +input[type="file"], +input[type="image"], +input[type="submit"], input[type="reset"], -input[type="submit"] { +input[type="button"], +input[type="radio"], +input[type="checkbox"] { width: auto; - height: auto; } select, input[type="file"] { - height: 28px; + height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ *margin-top: 4px; /* For IE7, add top margin to align select with labels */ - line-height: 28px; -} -input[type="file"] { - line-height: 18px \9; + line-height: 30px; } select { width: 220px; + border: 1px solid #cccccc; background-color: #ffffff; } select[multiple], select[size] { height: auto; } -input[type="image"] { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; +select:focus, +input[type="file"]:focus, +input[type="radio"]:focus, +input[type="checkbox"]:focus { + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; } -textarea { +.uneditable-input, +.uneditable-textarea { + color: #999999; + background-color: #fcfcfc; + border-color: #cccccc; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + cursor: not-allowed; +} +.uneditable-input { + overflow: hidden; + white-space: nowrap; +} +.uneditable-textarea { + width: auto; height: auto; } -input[type="hidden"] { - display: none; +input:-moz-placeholder, +textarea:-moz-placeholder { + color: #999999; +} +input:-ms-input-placeholder, +textarea:-ms-input-placeholder { + color: #999999; +} +input::-webkit-input-placeholder, +textarea::-webkit-input-placeholder { + color: #999999; } .radio, .checkbox { - min-height: 18px; - padding-left: 18px; + min-height: 20px; + padding-left: 20px; } .radio input[type="radio"], .checkbox input[type="checkbox"] { float: left; - margin-left: -18px; + margin-left: -20px; } .controls > .radio:first-child, .controls > .checkbox:first-child { @@ -749,39 +1079,6 @@ input[type="hidden"] { .checkbox.inline + .checkbox.inline { margin-left: 10px; } -input, -textarea { - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; -} -input:focus, -textarea:focus { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); -} -input[type="file"]:focus, -input[type="radio"]:focus, -input[type="checkbox"]:focus, -select:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} .input-mini { width: 60px; } @@ -811,46 +1108,105 @@ textarea[class*="span"], float: none; margin-left: 0; } +.input-append input[class*="span"], +.input-append .uneditable-input[class*="span"], +.input-prepend input[class*="span"], +.input-prepend .uneditable-input[class*="span"], +.row-fluid input[class*="span"], +.row-fluid select[class*="span"], +.row-fluid textarea[class*="span"], +.row-fluid .uneditable-input[class*="span"], +.row-fluid .input-prepend [class*="span"], +.row-fluid .input-append [class*="span"] { + display: inline-block; +} input, textarea, .uneditable-input { margin-left: 0; } -input.span12, textarea.span12, .uneditable-input.span12 { - width: 930px; -} -input.span11, textarea.span11, .uneditable-input.span11 { - width: 850px; -} -input.span10, textarea.span10, .uneditable-input.span10 { - width: 770px; -} -input.span9, textarea.span9, .uneditable-input.span9 { - width: 690px; -} -input.span8, textarea.span8, .uneditable-input.span8 { - width: 610px; -} -input.span7, textarea.span7, .uneditable-input.span7 { - width: 530px; -} -input.span6, textarea.span6, .uneditable-input.span6 { - width: 450px; +.controls-row [class*="span"] + [class*="span"] { + margin-left: 20px; } -input.span5, textarea.span5, .uneditable-input.span5 { - width: 370px; +input.span12, +textarea.span12, +.uneditable-input.span12 { + width: 926px; +} +input.span11, +textarea.span11, +.uneditable-input.span11 { + width: 846px; +} +input.span10, +textarea.span10, +.uneditable-input.span10 { + width: 766px; +} +input.span9, +textarea.span9, +.uneditable-input.span9 { + width: 686px; +} +input.span8, +textarea.span8, +.uneditable-input.span8 { + width: 606px; +} +input.span7, +textarea.span7, +.uneditable-input.span7 { + width: 526px; +} +input.span6, +textarea.span6, +.uneditable-input.span6 { + width: 446px; +} +input.span5, +textarea.span5, +.uneditable-input.span5 { + width: 366px; +} +input.span4, +textarea.span4, +.uneditable-input.span4 { + width: 286px; +} +input.span3, +textarea.span3, +.uneditable-input.span3 { + width: 206px; +} +input.span2, +textarea.span2, +.uneditable-input.span2 { + width: 126px; +} +input.span1, +textarea.span1, +.uneditable-input.span1 { + width: 46px; +} +.controls-row { + *zoom: 1; } -input.span4, textarea.span4, .uneditable-input.span4 { - width: 290px; +.controls-row:before, +.controls-row:after { + display: table; + content: ""; + line-height: 0; } -input.span3, textarea.span3, .uneditable-input.span3 { - width: 210px; +.controls-row:after { + clear: both; } -input.span2, textarea.span2, .uneditable-input.span2 { - width: 130px; +.controls-row [class*="span"], +.row-fluid .controls-row [class*="span"] { + float: left; } -input.span1, textarea.span1, .uneditable-input.span1 { - width: 50px; +.controls-row .checkbox[class*="span"], +.controls-row .radio[class*="span"] { + padding-top: 5px; } input[disabled], select[disabled], @@ -860,7 +1216,6 @@ select[readonly], textarea[readonly] { cursor: not-allowed; background-color: #eeeeee; - border-color: #ddd; } input[type="radio"][disabled], input[type="checkbox"][disabled], @@ -868,24 +1223,33 @@ input[type="radio"][readonly], input[type="checkbox"][readonly] { background-color: transparent; } -.control-group.warning > label, +.control-group.warning .control-label, .control-group.warning .help-block, .control-group.warning .help-inline { color: #c09853; } +.control-group.warning .checkbox, +.control-group.warning .radio, .control-group.warning input, .control-group.warning select, .control-group.warning textarea { color: #c09853; +} +.control-group.warning input, +.control-group.warning select, +.control-group.warning textarea { border-color: #c09853; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { border-color: #a47e3c; - -webkit-box-shadow: 0 0 6px #dbc59e; - -moz-box-shadow: 0 0 6px #dbc59e; - box-shadow: 0 0 6px #dbc59e; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; } .control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { @@ -893,24 +1257,33 @@ input[type="checkbox"][readonly] { background-color: #fcf8e3; border-color: #c09853; } -.control-group.error > label, +.control-group.error .control-label, .control-group.error .help-block, .control-group.error .help-inline { color: #b55457; } +.control-group.error .checkbox, +.control-group.error .radio, .control-group.error input, .control-group.error select, .control-group.error textarea { color: #b55457; +} +.control-group.error input, +.control-group.error select, +.control-group.error textarea { border-color: #b55457; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus { border-color: #954143; - -webkit-box-shadow: 0 0 6px #d49b9d; - -moz-box-shadow: 0 0 6px #d49b9d; - box-shadow: 0 0 6px #d49b9d; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d49b9d; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d49b9d; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d49b9d; } .control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { @@ -918,24 +1291,33 @@ input[type="checkbox"][readonly] { background-color: #f8f0f0; border-color: #b55457; } -.control-group.success > label, +.control-group.success .control-label, .control-group.success .help-block, .control-group.success .help-inline { color: #468847; } +.control-group.success .checkbox, +.control-group.success .radio, .control-group.success input, .control-group.success select, .control-group.success textarea { color: #468847; +} +.control-group.success input, +.control-group.success select, +.control-group.success textarea { border-color: #468847; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus { border-color: #356635; - -webkit-box-shadow: 0 0 6px #7aba7b; - -moz-box-shadow: 0 0 6px #7aba7b; - box-shadow: 0 0 6px #7aba7b; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; } .control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { @@ -943,59 +1325,78 @@ input[type="checkbox"][readonly] { background-color: #dff0d8; border-color: #468847; } -input:focus:required:invalid, -textarea:focus:required:invalid, -select:focus:required:invalid { +.control-group.info .control-label, +.control-group.info .help-block, +.control-group.info .help-inline { + color: #3a87ad; +} +.control-group.info .checkbox, +.control-group.info .radio, +.control-group.info input, +.control-group.info select, +.control-group.info textarea { + color: #3a87ad; +} +.control-group.info input, +.control-group.info select, +.control-group.info textarea { + border-color: #3a87ad; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); +} +.control-group.info input:focus, +.control-group.info select:focus, +.control-group.info textarea:focus { + border-color: #2d6987; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; +} +.control-group.info .input-prepend .add-on, +.control-group.info .input-append .add-on { + color: #3a87ad; + background-color: #d9edf7; + border-color: #3a87ad; +} +input:focus:invalid, +textarea:focus:invalid, +select:focus:invalid { color: #b94a48; border-color: #ee5f5b; } -input:focus:required:invalid:focus, -textarea:focus:required:invalid:focus, -select:focus:required:invalid:focus { +input:focus:invalid:focus, +textarea:focus:invalid:focus, +select:focus:invalid:focus { border-color: #e9322d; -webkit-box-shadow: 0 0 6px #f8b9b7; -moz-box-shadow: 0 0 6px #f8b9b7; box-shadow: 0 0 6px #f8b9b7; } .form-actions { - padding: 17px 20px 18px; - margin-top: 18px; - margin-bottom: 18px; + padding: 19px 20px 20px; + margin-top: 20px; + margin-bottom: 20px; background-color: #f5f5f5; - border-top: 1px solid #ddd; + border-top: 1px solid #e5e5e5; *zoom: 1; } .form-actions:before, .form-actions:after { display: table; content: ""; + line-height: 0; } .form-actions:after { clear: both; } -.uneditable-input { - overflow: hidden; - white-space: nowrap; - cursor: not-allowed; - background-color: #ffffff; - border-color: #eee; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -} -:-moz-placeholder { - color: #999999; -} -::-webkit-input-placeholder { - color: #999999; -} .help-block, .help-inline { - color: #555555; + color: #6a6a6a; } .help-block { display: block; - margin-bottom: 9px; + margin-bottom: 10px; } .help-inline { display: inline-block; @@ -1006,62 +1407,76 @@ select:focus:required:invalid:focus { vertical-align: middle; padding-left: 5px; } -.input-prepend, -.input-append { - margin-bottom: 5px; +.input-append, +.input-prepend { + display: inline-block; + margin-bottom: 10px; + vertical-align: middle; + font-size: 0; + white-space: nowrap; } -.input-prepend input, .input-append input, -.input-prepend select, +.input-prepend input, .input-append select, +.input-prepend select, +.input-append .uneditable-input, .input-prepend .uneditable-input, -.input-append .uneditable-input { +.input-append .dropdown-menu, +.input-prepend .dropdown-menu, +.input-append .popover, +.input-prepend .popover { + font-size: 14px; +} +.input-append input, +.input-prepend input, +.input-append select, +.input-prepend select, +.input-append .uneditable-input, +.input-prepend .uneditable-input { position: relative; margin-bottom: 0; *margin-left: 0; - vertical-align: middle; + vertical-align: top; -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } -.input-prepend input:focus, .input-append input:focus, -.input-prepend select:focus, +.input-prepend input:focus, .input-append select:focus, -.input-prepend .uneditable-input:focus, -.input-append .uneditable-input:focus { +.input-prepend select:focus, +.input-append .uneditable-input:focus, +.input-prepend .uneditable-input:focus { z-index: 2; } -.input-prepend .uneditable-input, -.input-append .uneditable-input { - border-left-color: #ccc; -} -.input-prepend .add-on, -.input-append .add-on { +.input-append .add-on, +.input-prepend .add-on { display: inline-block; width: auto; - height: 18px; + height: 20px; min-width: 16px; padding: 4px 5px; + font-size: 14px; font-weight: normal; - line-height: 18px; + line-height: 20px; text-align: center; text-shadow: 0 1px 0 #ffffff; - vertical-align: middle; background-color: #eeeeee; border: 1px solid #ccc; } -.input-prepend .add-on, .input-append .add-on, +.input-prepend .add-on, +.input-append .btn, .input-prepend .btn, -.input-append .btn { - margin-left: -1px; +.input-append .btn-group > .dropdown-toggle, +.input-prepend .btn-group > .dropdown-toggle { + vertical-align: top; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } -.input-prepend .active, -.input-append .active { +.input-append .active, +.input-prepend .active { background-color: #a9dba9; border-color: #46a546; } @@ -1082,12 +1497,21 @@ select:focus:required:invalid:focus { -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } -.input-append .uneditable-input { - border-right-color: #ccc; - border-left-color: #eee; +.input-append input + .btn-group .btn:last-child, +.input-append select + .btn-group .btn:last-child, +.input-append .uneditable-input + .btn-group .btn:last-child { + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; +} +.input-append .add-on, +.input-append .btn, +.input-append .btn-group { + margin-left: -1px; } .input-append .add-on:last-child, -.input-append .btn:last-child { +.input-append .btn:last-child, +.input-append .btn-group:last-child > .dropdown-toggle { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; @@ -1099,6 +1523,13 @@ select:focus:required:invalid:focus { -moz-border-radius: 0; border-radius: 0; } +.input-prepend.input-append input + .btn-group .btn, +.input-prepend.input-append select + .btn-group .btn, +.input-prepend.input-append .uneditable-input + .btn-group .btn { + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; +} .input-prepend.input-append .add-on:first-child, .input-prepend.input-append .btn:first-child { margin-right: -1px; @@ -1113,7 +1544,10 @@ select:focus:required:invalid:focus { -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } -.search-query { +.input-prepend.input-append .btn-group:first-child { + margin-left: 0; +} +input.search-query { padding-right: 14px; padding-right: 4px \9; padding-left: 14px; @@ -1121,9 +1555,36 @@ select:focus:required:invalid:focus { /* IE7-8 doesn't have border-radius, so don't indent the padding */ margin-bottom: 0; - -webkit-border-radius: 14px; - -moz-border-radius: 14px; - border-radius: 14px; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; +} +/* Allow for input prepend/append in search forms */ +.form-search .input-append .search-query, +.form-search .input-prepend .search-query { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.form-search .input-append .search-query { + -webkit-border-radius: 14px 0 0 14px; + -moz-border-radius: 14px 0 0 14px; + border-radius: 14px 0 0 14px; +} +.form-search .input-append .btn { + -webkit-border-radius: 0 14px 14px 0; + -moz-border-radius: 0 14px 14px 0; + border-radius: 0 14px 14px 0; +} +.form-search .input-prepend .search-query { + -webkit-border-radius: 0 14px 14px 0; + -moz-border-radius: 0 14px 14px 0; + border-radius: 0 14px 14px 0; +} +.form-search .input-prepend .btn { + -webkit-border-radius: 14px 0 0 14px; + -moz-border-radius: 14px 0 0 14px; + border-radius: 14px 0 0 14px; } .form-search input, .form-inline input, @@ -1152,6 +1613,7 @@ select:focus:required:invalid:focus { *zoom: 1; margin-bottom: 0; + vertical-align: middle; } .form-search .hide, .form-inline .hide, @@ -1159,7 +1621,9 @@ select:focus:required:invalid:focus { display: none; } .form-search label, -.form-inline label { +.form-inline label, +.form-search .btn-group, +.form-inline .btn-group { display: inline-block; } .form-search .input-append, @@ -1185,45 +1649,53 @@ select:focus:required:invalid:focus { margin-left: 0; } .control-group { - margin-bottom: 9px; + margin-bottom: 10px; } legend + .control-group { - margin-top: 18px; + margin-top: 20px; -webkit-margin-top-collapse: separate; } .form-horizontal .control-group { - margin-bottom: 18px; + margin-bottom: 20px; *zoom: 1; } .form-horizontal .control-group:before, .form-horizontal .control-group:after { display: table; content: ""; + line-height: 0; } .form-horizontal .control-group:after { clear: both; } .form-horizontal .control-label { float: left; - width: 140px; + width: 160px; padding-top: 5px; text-align: right; } .form-horizontal .controls { *display: inline-block; *padding-left: 20px; - margin-left: 160px; + margin-left: 180px; *margin-left: 0; } .form-horizontal .controls:first-child { - *padding-left: 160px; + *padding-left: 180px; } .form-horizontal .help-block { - margin-top: 9px; margin-bottom: 0; } +.form-horizontal input + .help-block, +.form-horizontal select + .help-block, +.form-horizontal textarea + .help-block, +.form-horizontal .uneditable-input + .help-block, +.form-horizontal .input-prepend + .help-block, +.form-horizontal .input-append + .help-block { + margin-top: 10px; +} .form-horizontal .form-actions { - padding-left: 160px; + padding-left: 180px; } table { max-width: 100%; @@ -1233,12 +1705,12 @@ table { } .table { width: 100%; - margin-bottom: 18px; + margin-bottom: 20px; } .table th, .table td { padding: 8px; - line-height: 18px; + line-height: 20px; text-align: left; vertical-align: top; border-top: 1px solid #dddddd; @@ -1260,6 +1732,9 @@ table { .table tbody + tbody { border-top: 2px solid #dddddd; } +.table .table { + background-color: #eeeeee; +} .table-condensed th, .table-condensed td { padding: 4px 5px; @@ -1267,7 +1742,7 @@ table { .table-bordered { border: 1px solid #dddddd; border-collapse: separate; - *border-collapse: collapsed; + *border-collapse: collapse; border-left: 0; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -1288,160 +1763,175 @@ table { .table-bordered tbody:first-child tr:first-child td { border-top: 0; } -.table-bordered thead:first-child tr:first-child th:first-child, -.table-bordered tbody:first-child tr:first-child td:first-child { +.table-bordered thead:first-child tr:first-child > th:first-child, +.table-bordered tbody:first-child tr:first-child > td:first-child, +.table-bordered tbody:first-child tr:first-child > th:first-child { -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; } -.table-bordered thead:first-child tr:first-child th:last-child, -.table-bordered tbody:first-child tr:first-child td:last-child { +.table-bordered thead:first-child tr:first-child > th:last-child, +.table-bordered tbody:first-child tr:first-child > td:last-child, +.table-bordered tbody:first-child tr:first-child > th:last-child { -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; } -.table-bordered thead:last-child tr:last-child th:first-child, -.table-bordered tbody:last-child tr:last-child td:first-child { - -webkit-border-radius: 0 0 0 4px; - -moz-border-radius: 0 0 0 4px; - border-radius: 0 0 0 4px; +.table-bordered thead:last-child tr:last-child > th:first-child, +.table-bordered tbody:last-child tr:last-child > td:first-child, +.table-bordered tbody:last-child tr:last-child > th:first-child, +.table-bordered tfoot:last-child tr:last-child > td:first-child, +.table-bordered tfoot:last-child tr:last-child > th:first-child { -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } -.table-bordered thead:last-child tr:last-child th:last-child, -.table-bordered tbody:last-child tr:last-child td:last-child { +.table-bordered thead:last-child tr:last-child > th:last-child, +.table-bordered tbody:last-child tr:last-child > td:last-child, +.table-bordered tbody:last-child tr:last-child > th:last-child, +.table-bordered tfoot:last-child tr:last-child > td:last-child, +.table-bordered tfoot:last-child tr:last-child > th:last-child { -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; } -.table-striped tbody tr:nth-child(odd) td, -.table-striped tbody tr:nth-child(odd) th { +.table-bordered tfoot + tbody:last-child tr:last-child td:first-child { + -webkit-border-bottom-left-radius: 0; + -moz-border-radius-bottomleft: 0; + border-bottom-left-radius: 0; +} +.table-bordered tfoot + tbody:last-child tr:last-child td:last-child { + -webkit-border-bottom-right-radius: 0; + -moz-border-radius-bottomright: 0; + border-bottom-right-radius: 0; +} +.table-bordered caption + thead tr:first-child th:first-child, +.table-bordered caption + tbody tr:first-child td:first-child, +.table-bordered colgroup + thead tr:first-child th:first-child, +.table-bordered colgroup + tbody tr:first-child td:first-child { + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; +} +.table-bordered caption + thead tr:first-child th:last-child, +.table-bordered caption + tbody tr:first-child td:last-child, +.table-bordered colgroup + thead tr:first-child th:last-child, +.table-bordered colgroup + tbody tr:first-child td:last-child { + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; +} +.table-striped tbody > tr:nth-child(odd) > td, +.table-striped tbody > tr:nth-child(odd) > th { background-color: #f9f9f9; } -.table tbody tr:hover td, -.table tbody tr:hover th { +.table-hover tbody tr:hover > td, +.table-hover tbody tr:hover > th { background-color: #f5f5f5; } -table .span1 { +table td[class*="span"], +table th[class*="span"], +.row-fluid table td[class*="span"], +.row-fluid table th[class*="span"] { + display: table-cell; + float: none; + margin-left: 0; +} +.table td.span1, +.table th.span1 { float: none; width: 44px; margin-left: 0; } -table .span2 { +.table td.span2, +.table th.span2 { float: none; width: 124px; margin-left: 0; } -table .span3 { +.table td.span3, +.table th.span3 { float: none; width: 204px; margin-left: 0; } -table .span4 { +.table td.span4, +.table th.span4 { float: none; width: 284px; margin-left: 0; } -table .span5 { +.table td.span5, +.table th.span5 { float: none; width: 364px; margin-left: 0; } -table .span6 { +.table td.span6, +.table th.span6 { float: none; width: 444px; margin-left: 0; } -table .span7 { +.table td.span7, +.table th.span7 { float: none; width: 524px; margin-left: 0; } -table .span8 { +.table td.span8, +.table th.span8 { float: none; width: 604px; margin-left: 0; } -table .span9 { +.table td.span9, +.table th.span9 { float: none; width: 684px; margin-left: 0; } -table .span10 { +.table td.span10, +.table th.span10 { float: none; width: 764px; margin-left: 0; } -table .span11 { +.table td.span11, +.table th.span11 { float: none; width: 844px; margin-left: 0; } -table .span12 { +.table td.span12, +.table th.span12 { float: none; width: 924px; margin-left: 0; } -table .span13 { - float: none; - width: 1004px; - margin-left: 0; -} -table .span14 { - float: none; - width: 1084px; - margin-left: 0; -} -table .span15 { - float: none; - width: 1164px; - margin-left: 0; -} -table .span16 { - float: none; - width: 1244px; - margin-left: 0; -} -table .span17 { - float: none; - width: 1324px; - margin-left: 0; +.table tbody tr.success > td { + background-color: #dff0d8; } -table .span18 { - float: none; - width: 1404px; - margin-left: 0; +.table tbody tr.error > td { + background-color: #f8f0f0; } -table .span19 { - float: none; - width: 1484px; - margin-left: 0; +.table tbody tr.warning > td { + background-color: #fcf8e3; } -table .span20 { - float: none; - width: 1564px; - margin-left: 0; +.table tbody tr.info > td { + background-color: #d9edf7; } -table .span21 { - float: none; - width: 1644px; - margin-left: 0; +.table-hover tbody tr.success:hover > td { + background-color: #d0e9c6; } -table .span22 { - float: none; - width: 1724px; - margin-left: 0; +.table-hover tbody tr.error:hover > td { + background-color: #f0dfe0; } -table .span23 { - float: none; - width: 1804px; - margin-left: 0; +.table-hover tbody tr.warning:hover > td { + background-color: #faf2cc; } -table .span24 { - float: none; - width: 1884px; - margin-left: 0; +.table-hover tbody tr.info:hover > td { + background-color: #c4e3f3; } .dropup, .dropdown { @@ -1463,18 +1953,11 @@ table .span24 { border-right: 4px solid transparent; border-left: 4px solid transparent; content: ""; - opacity: 0.3; - filter: alpha(opacity=30); } .dropdown .caret { margin-top: 8px; margin-left: 2px; } -.dropdown:hover .caret, -.open .caret { - opacity: 1; - filter: alpha(opacity=100); -} .dropdown-menu { position: absolute; top: 100%; @@ -1483,17 +1966,17 @@ table .span24 { display: none; float: left; min-width: 160px; - padding: 4px 0; - margin: 1px 0 0; + padding: 5px 0; + margin: 2px 0 0; list-style: none; background-color: #ffffff; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); *border-right-width: 2px; *border-bottom-width: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); @@ -1508,35 +1991,71 @@ table .span24 { .dropdown-menu .divider { *width: 100%; height: 1px; - margin: 8px 1px; + margin: 9px 1px; *margin: -5px 0 5px; overflow: hidden; background-color: #e5e5e5; border-bottom: 1px solid #ffffff; } -.dropdown-menu a { +.dropdown-menu > li > a { display: block; - padding: 3px 15px; + padding: 3px 20px; clear: both; font-weight: normal; - line-height: 18px; + line-height: 20px; color: #333333; white-space: nowrap; } -.dropdown-menu li > a:hover, -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { +.dropdown-menu > li > a:hover, +.dropdown-menu > li > a:focus, +.dropdown-submenu:hover > a, +.dropdown-submenu:focus > a { + text-decoration: none; + color: #ffffff; + background-color: #e62f8d; + background-image: -moz-linear-gradient(top, #e73892, #e42186); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e73892), to(#e42186)); + background-image: -webkit-linear-gradient(top, #e73892, #e42186); + background-image: -o-linear-gradient(top, #e73892, #e42186); + background-image: linear-gradient(to bottom, #e73892, #e42186); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe73892', endColorstr='#ffe42186', GradientType=0); +} +.dropdown-menu > .active > a, +.dropdown-menu > .active > a:hover, +.dropdown-menu > .active > a:focus { color: #ffffff; text-decoration: none; - background-color: #b509b5; + outline: 0; + background-color: #e62f8d; + background-image: -moz-linear-gradient(top, #e73892, #e42186); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e73892), to(#e42186)); + background-image: -webkit-linear-gradient(top, #e73892, #e42186); + background-image: -o-linear-gradient(top, #e73892, #e42186); + background-image: linear-gradient(to bottom, #e73892, #e42186); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe73892', endColorstr='#ffe42186', GradientType=0); +} +.dropdown-menu > .disabled > a, +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { + color: #999999; +} +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { + text-decoration: none; + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + cursor: default; } .open { *z-index: 1000; } -.open .dropdown-menu { +.open > .dropdown-menu { display: block; } -.pull-right .dropdown-menu { +.pull-right > .dropdown-menu { right: 0; left: auto; } @@ -1544,7 +2063,7 @@ table .span24 { .navbar-fixed-bottom .dropdown .caret { border-top: 0; border-bottom: 4px solid #000000; - content: "\2191"; + content: ""; } .dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { @@ -1552,7 +2071,62 @@ table .span24 { bottom: 100%; margin-bottom: 1px; } +.dropdown-submenu { + position: relative; +} +.dropdown-submenu > .dropdown-menu { + top: 0; + left: 100%; + margin-top: -6px; + margin-left: -1px; + -webkit-border-radius: 0 6px 6px 6px; + -moz-border-radius: 0 6px 6px 6px; + border-radius: 0 6px 6px 6px; +} +.dropdown-submenu:hover > .dropdown-menu { + display: block; +} +.dropup .dropdown-submenu > .dropdown-menu { + top: auto; + bottom: 0; + margin-top: 0; + margin-bottom: -2px; + -webkit-border-radius: 5px 5px 5px 0; + -moz-border-radius: 5px 5px 5px 0; + border-radius: 5px 5px 5px 0; +} +.dropdown-submenu > a:after { + display: block; + content: " "; + float: right; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; + border-width: 5px 0 5px 5px; + border-left-color: #cccccc; + margin-top: 5px; + margin-right: -10px; +} +.dropdown-submenu:hover > a:after { + border-left-color: #ffffff; +} +.dropdown-submenu.pull-left { + float: none; +} +.dropdown-submenu.pull-left > .dropdown-menu { + left: -100%; + margin-left: 10px; + -webkit-border-radius: 6px 0 6px 6px; + -moz-border-radius: 6px 0 6px 6px; + border-radius: 6px 0 6px 6px; +} +.dropdown .dropdown-menu .nav-header { + padding-left: 20px; + padding-right: 20px; +} .typeahead { + z-index: 1051; margin-top: 2px; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -1563,8 +2137,7 @@ table .span24 { padding: 19px; margin-bottom: 20px; background-color: #f5f5f5; - border: 1px solid #eee; - border: 1px solid rgba(0, 0, 0, 0.05); + border: 1px solid #e3e3e3; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -1590,16 +2163,13 @@ table .span24 { } .fade { opacity: 0; - filter: alpha(opacity=0); -webkit-transition: opacity 0.15s linear; -moz-transition: opacity 0.15s linear; - -ms-transition: opacity 0.15s linear; -o-transition: opacity 0.15s linear; transition: opacity 0.15s linear; } .fade.in { opacity: 1; - filter: alpha(opacity=100); } .collapse { position: relative; @@ -1607,7 +2177,6 @@ table .span24 { overflow: hidden; -webkit-transition: height 0.35s ease; -moz-transition: height 0.35s ease; - -ms-transition: height 0.35s ease; -o-transition: height 0.35s ease; transition: height 0.35s ease; } @@ -1618,13 +2187,14 @@ table .span24 { float: right; font-size: 20px; font-weight: bold; - line-height: 18px; + line-height: 20px; color: #000000; text-shadow: 0 1px 0 #ffffff; opacity: 0.2; filter: alpha(opacity=20); } -.close:hover { +.close:hover, +.close:focus { color: #000000; text-decoration: none; cursor: pointer; @@ -1644,25 +2214,23 @@ button.close { /* IE7 inline-block hack */ *zoom: 1; - padding: 4px 10px 4px; + padding: 4px 12px; margin-bottom: 0; - font-size: 13px; - line-height: 18px; - *line-height: 20px; - color: #333333; + font-size: 14px; + line-height: 20px; text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); vertical-align: middle; cursor: pointer; + color: #333333; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); background-color: #f7f7f7; background-image: -moz-linear-gradient(top, #ffffff, #eaeaea); - background-image: -ms-linear-gradient(top, #ffffff, #eaeaea); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#eaeaea)); background-image: -webkit-linear-gradient(top, #ffffff, #eaeaea); background-image: -o-linear-gradient(top, #ffffff, #eaeaea); - background-image: linear-gradient(top, #ffffff, #eaeaea); + background-image: linear-gradient(to bottom, #ffffff, #eaeaea); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#eaeaea', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeaeaea', GradientType=0); border-color: #eaeaea #eaeaea #c4c4c4; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #eaeaea; @@ -1681,10 +2249,12 @@ button.close { box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); } .btn:hover, +.btn:focus, .btn:active, .btn.active, .btn.disabled, .btn[disabled] { + color: #333333; background-color: #eaeaea; *background-color: #dddddd; } @@ -1695,17 +2265,13 @@ button.close { .btn:first-child { *margin-left: 0; } -.btn:hover { +.btn:hover, +.btn:focus { color: #333333; text-decoration: none; - background-color: #e6e6e6; - *background-color: #d9d9d9; - /* Buttons in IE7 don't get borders, so darken on hover */ - background-position: 0 -15px; -webkit-transition: background-position 0.1s linear; -moz-transition: background-position 0.1s linear; - -ms-transition: background-position 0.1s linear; -o-transition: background-position 0.1s linear; transition: background-position 0.1s linear; } @@ -1716,8 +2282,6 @@ button.close { } .btn.active, .btn:active { - background-color: #e6e6e6; - background-color: #d9d9d9 \9; background-image: none; outline: 0; -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); @@ -1727,7 +2291,6 @@ button.close { .btn.disabled, .btn[disabled] { cursor: default; - background-color: #e6e6e6; background-image: none; opacity: 0.65; filter: alpha(opacity=65); @@ -1736,43 +2299,54 @@ button.close { box-shadow: none; } .btn-large { - padding: 9px 14px; - font-size: 15px; - line-height: normal; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; + padding: 11px 19px; + font-size: 17.5px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } -.btn-large [class^="icon-"] { - margin-top: 1px; +.btn-large [class^="icon-"], +.btn-large [class*=" icon-"] { + margin-top: 4px; } .btn-small { - padding: 5px 9px; - font-size: 11px; - line-height: 16px; + padding: 2px 10px; + font-size: 11.9px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.btn-small [class^="icon-"] { +.btn-small [class^="icon-"], +.btn-small [class*=" icon-"] { + margin-top: 0; +} +.btn-mini [class^="icon-"], +.btn-mini [class*=" icon-"] { margin-top: -1px; } .btn-mini { - padding: 2px 6px; - font-size: 11px; - line-height: 14px; + padding: 0 6px; + font-size: 10.5px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.btn-primary, -.btn-primary:hover, -.btn-warning, -.btn-warning:hover, -.btn-danger, -.btn-danger:hover, -.btn-success, -.btn-success:hover, -.btn-info, -.btn-info:hover, -.btn-inverse, -.btn-inverse:hover { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +.btn-block { + display: block; + width: 100%; + padding-left: 0; + padding-right: 0; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.btn-block + .btn-block { + margin-top: 5px; +} +input[type="submit"].btn-block, +input[type="reset"].btn-block, +input[type="button"].btn-block { + width: 100%; } .btn-primary.active, .btn-warning.active, @@ -1782,49 +2356,49 @@ button.close { .btn-inverse.active { color: rgba(255, 255, 255, 0.75); } -.btn { - border-color: #ccc; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} .btn-primary { - background-color: #f654f6; - background-image: -moz-linear-gradient(top, #f544f5, #f76bf7); - background-image: -ms-linear-gradient(top, #f544f5, #f76bf7); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f544f5), to(#f76bf7)); - background-image: -webkit-linear-gradient(top, #f544f5, #f76bf7); - background-image: -o-linear-gradient(top, #f544f5, #f76bf7); - background-image: linear-gradient(top, #f544f5, #f76bf7); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #ea53a1; + background-image: -moz-linear-gradient(top, #ec66ab, #e73892); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ec66ab), to(#e73892)); + background-image: -webkit-linear-gradient(top, #ec66ab, #e73892); + background-image: -o-linear-gradient(top, #ec66ab, #e73892); + background-image: linear-gradient(to bottom, #ec66ab, #e73892); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f544f5', endColorstr='#f76bf7', GradientType=0); - border-color: #f76bf7 #f76bf7 #f322f3; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffec66ab', endColorstr='#ffe73892', GradientType=0); + border-color: #e73892 #e73892 #bc176c; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #f76bf7; + *background-color: #e73892; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-primary:hover, +.btn-primary:focus, .btn-primary:active, .btn-primary.active, .btn-primary.disabled, .btn-primary[disabled] { - background-color: #f76bf7; - *background-color: #f653f6; + color: #ffffff; + background-color: #e73892; + *background-color: #e42186; } .btn-primary:active, .btn-primary.active { - background-color: #f43bf4 \9; + background-color: #d31979 \9; } .btn-warning { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #faa732; background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-linear-gradient(top, #fbb450, #f89406); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); background-image: -webkit-linear-gradient(top, #fbb450, #f89406); background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(top, #fbb450, #f89406); + background-image: linear-gradient(to bottom, #fbb450, #f89406); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); border-color: #f89406 #f89406 #ad6704; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #f89406; @@ -1833,10 +2407,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-warning:hover, +.btn-warning:focus, .btn-warning:active, .btn-warning.active, .btn-warning.disabled, .btn-warning[disabled] { + color: #ffffff; background-color: #f89406; *background-color: #df8505; } @@ -1845,15 +2421,16 @@ button.close { background-color: #c67605 \9; } .btn-danger { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #da4f49; background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(top, #ee5f5b, #bd362f); + background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0); border-color: #bd362f #bd362f #802420; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #bd362f; @@ -1862,10 +2439,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-danger:hover, +.btn-danger:focus, .btn-danger:active, .btn-danger.active, .btn-danger.disabled, .btn-danger[disabled] { + color: #ffffff; background-color: #bd362f; *background-color: #a9302a; } @@ -1874,15 +2453,16 @@ button.close { background-color: #942a25 \9; } .btn-success { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #5bb75b; background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-linear-gradient(top, #62c462, #51a351); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); background-image: -webkit-linear-gradient(top, #62c462, #51a351); background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(top, #62c462, #51a351); + background-image: linear-gradient(to bottom, #62c462, #51a351); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0); border-color: #51a351 #51a351 #387038; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #51a351; @@ -1891,10 +2471,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-success:hover, +.btn-success:focus, .btn-success:active, .btn-success.active, .btn-success.disabled, .btn-success[disabled] { + color: #ffffff; background-color: #51a351; *background-color: #499249; } @@ -1903,15 +2485,16 @@ button.close { background-color: #408140 \9; } .btn-info { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #49afcd; background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(top, #5bc0de, #2f96b4); + background-image: linear-gradient(to bottom, #5bc0de, #2f96b4); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0); border-color: #2f96b4 #2f96b4 #1f6377; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #2f96b4; @@ -1920,10 +2503,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-info:hover, +.btn-info:focus, .btn-info:active, .btn-info.active, .btn-info.disabled, .btn-info[disabled] { + color: #ffffff; background-color: #2f96b4; *background-color: #2a85a0; } @@ -1932,15 +2517,16 @@ button.close { background-color: #24748c \9; } .btn-inverse { - background-color: #414141; - background-image: -moz-linear-gradient(top, #555555, #222222); - background-image: -ms-linear-gradient(top, #555555, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); - background-image: -webkit-linear-gradient(top, #555555, #222222); - background-image: -o-linear-gradient(top, #555555, #222222); - background-image: linear-gradient(top, #555555, #222222); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #363636; + background-image: -moz-linear-gradient(top, #444444, #222222); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222)); + background-image: -webkit-linear-gradient(top, #444444, #222222); + background-image: -o-linear-gradient(top, #444444, #222222); + background-image: linear-gradient(to bottom, #444444, #222222); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0); border-color: #222222 #222222 #000000; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #222222; @@ -1949,10 +2535,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-inverse:hover, +.btn-inverse:focus, .btn-inverse:active, .btn-inverse.active, .btn-inverse.disabled, .btn-inverse[disabled] { + color: #ffffff; background-color: #222222; *background-color: #151515; } @@ -1962,8 +2550,8 @@ button.close { } button.btn, input[type="submit"].btn { - *padding-top: 2px; - *padding-bottom: 2px; + *padding-top: 3px; + *padding-bottom: 3px; } button.btn::-moz-focus-inner, input[type="submit"].btn::-moz-focus-inner { @@ -1985,19 +2573,46 @@ input[type="submit"].btn.btn-mini { *padding-top: 1px; *padding-bottom: 1px; } +.btn-link, +.btn-link:active, +.btn-link[disabled] { + background-color: transparent; + background-image: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} +.btn-link { + border-color: transparent; + cursor: pointer; + color: #e73892; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.btn-link:hover, +.btn-link:focus { + color: #bc176c; + text-decoration: underline; + background-color: transparent; +} +.btn-link[disabled]:hover, +.btn-link[disabled]:focus { + color: #333333; + text-decoration: none; +} .btn-group { position: relative; + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + *zoom: 1; + font-size: 0; + vertical-align: middle; + white-space: nowrap; *margin-left: .3em; } -.btn-group:before, -.btn-group:after { - display: table; - content: ""; -} -.btn-group:after { - clear: both; -} .btn-group:first-child { *margin-left: 0; } @@ -2005,24 +2620,38 @@ input[type="submit"].btn.btn-mini { margin-left: 5px; } .btn-toolbar { - margin-top: 9px; - margin-bottom: 9px; + font-size: 0; + margin-top: 10px; + margin-bottom: 10px; } -.btn-toolbar .btn-group { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; +.btn-toolbar > .btn + .btn, +.btn-toolbar > .btn-group + .btn, +.btn-toolbar > .btn + .btn-group { + margin-left: 5px; } .btn-group > .btn { position: relative; - float: left; - margin-left: -1px; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } +.btn-group > .btn + .btn { + margin-left: -1px; +} +.btn-group > .btn, +.btn-group > .dropdown-menu, +.btn-group > .popover { + font-size: 14px; +} +.btn-group > .btn-mini { + font-size: 10.5px; +} +.btn-group > .btn-small { + font-size: 11.9px; +} +.btn-group > .btn-large { + font-size: 17.5px; +} .btn-group > .btn:first-child { margin-left: 0; -webkit-border-top-left-radius: 4px; @@ -2069,26 +2698,30 @@ input[type="submit"].btn.btn-mini { .btn-group.open .dropdown-toggle { outline: 0; } -.btn-group > .dropdown-toggle { +.btn-group > .btn + .dropdown-toggle { padding-left: 8px; padding-right: 8px; -webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); -moz-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); - *padding-top: 4px; - *padding-bottom: 4px; + *padding-top: 5px; + *padding-bottom: 5px; } -.btn-group > .btn-mini.dropdown-toggle { +.btn-group > .btn-mini + .dropdown-toggle { padding-left: 5px; padding-right: 5px; + *padding-top: 2px; + *padding-bottom: 2px; } -.btn-group > .btn-small.dropdown-toggle { - *padding-top: 4px; +.btn-group > .btn-small + .dropdown-toggle { + *padding-top: 5px; *padding-bottom: 4px; } -.btn-group > .btn-large.dropdown-toggle { +.btn-group > .btn-large + .dropdown-toggle { padding-left: 12px; padding-right: 12px; + *padding-top: 7px; + *padding-bottom: 7px; } .btn-group.open .dropdown-toggle { background-image: none; @@ -2100,7 +2733,7 @@ input[type="submit"].btn.btn-mini { background-color: #eaeaea; } .btn-group.open .btn-primary.dropdown-toggle { - background-color: #f76bf7; + background-color: #e73892; } .btn-group.open .btn-warning.dropdown-toggle { background-color: #f89406; @@ -2118,29 +2751,23 @@ input[type="submit"].btn.btn-mini { background-color: #222222; } .btn .caret { - margin-top: 7px; + margin-top: 8px; margin-left: 0; } -.btn:hover .caret, -.open.btn-group .caret { - opacity: 1; - filter: alpha(opacity=100); -} -.btn-mini .caret { - margin-top: 5px; -} -.btn-small .caret { +.btn-large .caret { margin-top: 6px; } .btn-large .caret { - margin-top: 6px; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; } +.btn-mini .caret, +.btn-small .caret { + margin-top: 8px; +} .dropup .btn-large .caret { - border-bottom: 5px solid #000000; - border-top: 0; + border-bottom-width: 5px; } .btn-primary .caret, .btn-warning .caret, @@ -2150,45 +2777,95 @@ input[type="submit"].btn.btn-mini { .btn-inverse .caret { border-top-color: #ffffff; border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +} +.btn-group-vertical { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; +} +.btn-group-vertical > .btn { + display: block; + float: none; + max-width: 100%; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.btn-group-vertical > .btn + .btn { + margin-left: 0; + margin-top: -1px; +} +.btn-group-vertical > .btn:first-child { + -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; +} +.btn-group-vertical > .btn:last-child { + -webkit-border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; + border-radius: 0 0 4px 4px; +} +.btn-group-vertical > .btn-large:first-child { + -webkit-border-radius: 6px 6px 0 0; + -moz-border-radius: 6px 6px 0 0; + border-radius: 6px 6px 0 0; +} +.btn-group-vertical > .btn-large:last-child { + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; } .alert { padding: 8px 35px 8px 14px; - margin-bottom: 18px; + margin-bottom: 20px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); background-color: #fcf8e3; border: 1px solid #fbeed5; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; +} +.alert, +.alert h4 { color: #c09853; } -.alert-heading { - color: inherit; +.alert h4 { + margin: 0; } .alert .close { position: relative; top: -2px; right: -21px; - line-height: 18px; + line-height: 20px; } .alert-success { background-color: #dff0d8; border-color: #d6e9c6; color: #468847; } +.alert-success h4 { + color: #468847; +} .alert-danger, .alert-error { background-color: #f8f0f0; border-color: #c6898b; color: #b55457; } +.alert-danger h4, +.alert-error h4 { + color: #b55457; +} .alert-info { background-color: #d9edf7; border-color: #bce8f1; color: #3a87ad; } +.alert-info h4 { + color: #3a87ad; +} .alert-block { padding-top: 14px; padding-bottom: 14px; @@ -2202,25 +2879,29 @@ input[type="submit"].btn.btn-mini { } .nav { margin-left: 0; - margin-bottom: 18px; + margin-bottom: 20px; list-style: none; } .nav > li > a { display: block; } -.nav > li > a:hover { +.nav > li > a:hover, +.nav > li > a:focus { text-decoration: none; background-color: #eeeeee; } +.nav > li > a > img { + max-width: none; +} .nav > .pull-right { float: right; } -.nav .nav-header { +.nav-header { display: block; padding: 3px 15px; font-size: 11px; font-weight: bold; - line-height: 18px; + line-height: 20px; color: #999999; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); text-transform: uppercase; @@ -2243,18 +2924,20 @@ input[type="submit"].btn.btn-mini { padding: 3px 15px; } .nav-list > .active > a, -.nav-list > .active > a:hover { +.nav-list > .active > a:hover, +.nav-list > .active > a:focus { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #b509b5; + background-color: #e73892; } -.nav-list [class^="icon-"] { +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { margin-right: 2px; } .nav-list .divider { *width: 100%; height: 1px; - margin: 8px 1px; + margin: 9px 1px; *margin: -5px 0 5px; overflow: hidden; background-color: #e5e5e5; @@ -2270,6 +2953,7 @@ input[type="submit"].btn.btn-mini { .nav-pills:after { display: table; content: ""; + line-height: 0; } .nav-tabs:after, .nav-pills:after { @@ -2295,19 +2979,21 @@ input[type="submit"].btn.btn-mini { .nav-tabs > li > a { padding-top: 8px; padding-bottom: 8px; - line-height: 18px; + line-height: 20px; border: 1px solid transparent; -webkit-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0; } -.nav-tabs > li > a:hover { +.nav-tabs > li > a:hover, +.nav-tabs > li > a:focus { border-color: #eeeeee #eeeeee #dddddd; } .nav-tabs > .active > a, -.nav-tabs > .active > a:hover { +.nav-tabs > .active > a:hover, +.nav-tabs > .active > a:focus { color: #555555; - background-color: #ffffff; + background-color: #eeeeee; border: 1px solid #ddd; border-bottom-color: transparent; cursor: default; @@ -2322,9 +3008,10 @@ input[type="submit"].btn.btn-mini { border-radius: 5px; } .nav-pills > .active > a, -.nav-pills > .active > a:hover { +.nav-pills > .active > a:hover, +.nav-pills > .active > a:focus { color: #ffffff; - background-color: #b509b5; + background-color: #e73892; } .nav-stacked > li { float: none; @@ -2342,16 +3029,23 @@ input[type="submit"].btn.btn-mini { border-radius: 0; } .nav-tabs.nav-stacked > li:first-child > a { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; } .nav-tabs.nav-stacked > li:last-child > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } -.nav-tabs.nav-stacked > li > a:hover { +.nav-tabs.nav-stacked > li > a:hover, +.nav-tabs.nav-stacked > li > a:focus { border-color: #ddd; z-index: 2; } @@ -2362,51 +3056,60 @@ input[type="submit"].btn.btn-mini { margin-bottom: 1px; } .nav-tabs .dropdown-menu { - -webkit-border-radius: 0 0 5px 5px; - -moz-border-radius: 0 0 5px 5px; - border-radius: 0 0 5px 5px; + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; } .nav-pills .dropdown-menu { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } -.nav-tabs .dropdown-toggle .caret, -.nav-pills .dropdown-toggle .caret { - border-top-color: #b509b5; - border-bottom-color: #b509b5; +.nav .dropdown-toggle .caret { + border-top-color: #e73892; + border-bottom-color: #e73892; margin-top: 6px; } -.nav-tabs .dropdown-toggle:hover .caret, -.nav-pills .dropdown-toggle:hover .caret { - border-top-color: #6c056c; - border-bottom-color: #6c056c; +.nav .dropdown-toggle:hover .caret, +.nav .dropdown-toggle:focus .caret { + border-top-color: #bc176c; + border-bottom-color: #bc176c; } -.nav-tabs .active .dropdown-toggle .caret, -.nav-pills .active .dropdown-toggle .caret { - border-top-color: #333333; - border-bottom-color: #333333; +/* move down carets for tabs */ +.nav-tabs .dropdown-toggle .caret { + margin-top: 8px; } -.nav > .dropdown.active > a:hover { - color: #000000; +.nav .active .dropdown-toggle .caret { + border-top-color: #fff; + border-bottom-color: #fff; +} +.nav-tabs .active .dropdown-toggle .caret { + border-top-color: #555555; + border-bottom-color: #555555; +} +.nav > .dropdown.active > a:hover, +.nav > .dropdown.active > a:focus { cursor: pointer; } .nav-tabs .open .dropdown-toggle, .nav-pills .open .dropdown-toggle, -.nav > li.dropdown.open.active > a:hover { +.nav > li.dropdown.open.active > a:hover, +.nav > li.dropdown.open.active > a:focus { color: #ffffff; background-color: #999999; border-color: #999999; } .nav li.dropdown.open .caret, .nav li.dropdown.open.active .caret, -.nav li.dropdown.open a:hover .caret { +.nav li.dropdown.open a:hover .caret, +.nav li.dropdown.open a:focus .caret { border-top-color: #ffffff; border-bottom-color: #ffffff; opacity: 1; filter: alpha(opacity=100); } -.tabs-stacked .open > a:hover { +.tabs-stacked .open > a:hover, +.tabs-stacked .open > a:focus { border-color: #999999; } .tabbable { @@ -2416,6 +3119,7 @@ input[type="submit"].btn.btn-mini { .tabbable:after { display: table; content: ""; + line-height: 0; } .tabbable:after { clear: both; @@ -2448,12 +3152,14 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px; } -.tabs-below > .nav-tabs > li > a:hover { +.tabs-below > .nav-tabs > li > a:hover, +.tabs-below > .nav-tabs > li > a:focus { border-bottom-color: transparent; border-top-color: #ddd; } .tabs-below > .nav-tabs > .active > a, -.tabs-below > .nav-tabs > .active > a:hover { +.tabs-below > .nav-tabs > .active > a:hover, +.tabs-below > .nav-tabs > .active > a:focus { border-color: transparent #ddd #ddd #ddd; } .tabs-left > .nav-tabs > li, @@ -2477,11 +3183,13 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px; } -.tabs-left > .nav-tabs > li > a:hover { +.tabs-left > .nav-tabs > li > a:hover, +.tabs-left > .nav-tabs > li > a:focus { border-color: #eeeeee #dddddd #eeeeee #eeeeee; } .tabs-left > .nav-tabs .active > a, -.tabs-left > .nav-tabs .active > a:hover { +.tabs-left > .nav-tabs .active > a:hover, +.tabs-left > .nav-tabs .active > a:focus { border-color: #ddd transparent #ddd #ddd; *border-right-color: #ffffff; } @@ -2496,78 +3204,110 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; } -.tabs-right > .nav-tabs > li > a:hover { +.tabs-right > .nav-tabs > li > a:hover, +.tabs-right > .nav-tabs > li > a:focus { border-color: #eeeeee #eeeeee #eeeeee #dddddd; } .tabs-right > .nav-tabs .active > a, -.tabs-right > .nav-tabs .active > a:hover { +.tabs-right > .nav-tabs .active > a:hover, +.tabs-right > .nav-tabs .active > a:focus { border-color: #ddd #ddd #ddd transparent; *border-left-color: #ffffff; } +.nav > .disabled > a { + color: #999999; +} +.nav > .disabled > a:hover, +.nav > .disabled > a:focus { + text-decoration: none; + background-color: transparent; + cursor: default; +} .navbar { + overflow: visible; + margin-bottom: 20px; *position: relative; *z-index: 2; - overflow: visible; - margin-bottom: 18px; } .navbar-inner { min-height: 40px; padding-left: 20px; padding-right: 20px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); + background-color: #fafafa; + background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2)); + background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2); + background-image: -o-linear-gradient(top, #ffffff, #f2f2f2); + background-image: linear-gradient(to bottom, #ffffff, #f2f2f2); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); + border: 1px solid #d4d4d4; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); - -moz-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); - box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); + *zoom: 1; +} +.navbar-inner:before, +.navbar-inner:after { + display: table; + content: ""; + line-height: 0; +} +.navbar-inner:after { + clear: both; } .navbar .container { width: auto; } .nav-collapse.collapse { height: auto; -} -.navbar { - color: #999999; -} -.navbar .brand:hover { - text-decoration: none; + overflow: visible; } .navbar .brand { float: left; display: block; - padding: 8px 20px 12px; + padding: 10px 20px 10px; margin-left: -20px; font-size: 20px; font-weight: 200; - line-height: 1; - color: #999999; + color: #777777; + text-shadow: 0 1px 0 #ffffff; +} +.navbar .brand:hover, +.navbar .brand:focus { + text-decoration: none; } -.navbar .navbar-text { +.navbar-text { margin-bottom: 0; line-height: 40px; + color: #777777; } -.navbar .navbar-link { - color: #999999; +.navbar-link { + color: #777777; } -.navbar .navbar-link:hover { - color: #ffffff; +.navbar-link:hover, +.navbar-link:focus { + color: #333333; +} +.navbar .divider-vertical { + height: 40px; + margin: 0 9px; + border-left: 1px solid #f2f2f2; + border-right: 1px solid #ffffff; } .navbar .btn, .navbar .btn-group { margin-top: 5px; } -.navbar .btn-group .btn { - margin: 0; +.navbar .btn-group .btn, +.navbar .input-prepend .btn, +.navbar .input-append .btn, +.navbar .input-prepend .btn-group, +.navbar .input-append .btn-group { + margin-top: 0; } .navbar-form { margin-bottom: 0; @@ -2577,6 +3317,7 @@ input[type="submit"].btn.btn-mini { .navbar-form:after { display: table; content: ""; + line-height: 0; } .navbar-form:after { clear: both; @@ -2588,7 +3329,8 @@ input[type="submit"].btn.btn-mini { margin-top: 5px; } .navbar-form input, -.navbar-form select { +.navbar-form select, +.navbar-form .btn { display: inline-block; margin-bottom: 0; } @@ -2599,7 +3341,7 @@ input[type="submit"].btn.btn-mini { } .navbar-form .input-append, .navbar-form .input-prepend { - margin-top: 6px; + margin-top: 5px; white-space: nowrap; } .navbar-form .input-append input, @@ -2609,44 +3351,28 @@ input[type="submit"].btn.btn-mini { .navbar-search { position: relative; float: left; - margin-top: 6px; + margin-top: 5px; margin-bottom: 0; } .navbar-search .search-query { - padding: 4px 9px; + margin-bottom: 0; + padding: 4px 14px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 1; - color: #ffffff; - background-color: #626262; - border: 1px solid #151515; - -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - -webkit-transition: none; - -moz-transition: none; - -ms-transition: none; - -o-transition: none; - transition: none; -} -.navbar-search .search-query:-moz-placeholder { - color: #cccccc; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; } -.navbar-search .search-query::-webkit-input-placeholder { - color: #cccccc; +.navbar-static-top { + position: static; + margin-bottom: 0; } -.navbar-search .search-query:focus, -.navbar-search .search-query.focused { - padding: 5px 10px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - outline: 0; +.navbar-static-top .navbar-inner { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .navbar-fixed-top, .navbar-fixed-bottom { @@ -2657,6 +3383,13 @@ input[type="submit"].btn.btn-mini { margin-bottom: 0; } .navbar-fixed-top .navbar-inner, +.navbar-static-top .navbar-inner { + border-width: 0 0 1px; +} +.navbar-fixed-bottom .navbar-inner { + border-width: 1px 0 0; +} +.navbar-fixed-top .navbar-inner, .navbar-fixed-bottom .navbar-inner { padding-left: 0; padding-right: 0; @@ -2664,6 +3397,7 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0; border-radius: 0; } +.navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 940px; @@ -2671,9 +3405,20 @@ input[type="submit"].btn.btn-mini { .navbar-fixed-top { top: 0; } +.navbar-fixed-top .navbar-inner, +.navbar-static-top .navbar-inner { + -webkit-box-shadow: 0 1px 10px rgba(0,0,0,.1); + -moz-box-shadow: 0 1px 10px rgba(0,0,0,.1); + box-shadow: 0 1px 10px rgba(0,0,0,.1); +} .navbar-fixed-bottom { bottom: 0; } +.navbar-fixed-bottom .navbar-inner { + -webkit-box-shadow: 0 -1px 10px rgba(0,0,0,.1); + -moz-box-shadow: 0 -1px 10px rgba(0,0,0,.1); + box-shadow: 0 -1px 10px rgba(0,0,0,.1); +} .navbar .nav { position: relative; left: 0; @@ -2683,51 +3428,36 @@ input[type="submit"].btn.btn-mini { } .navbar .nav.pull-right { float: right; + margin-right: 0; } .navbar .nav > li { - display: block; float: left; } .navbar .nav > li > a { float: none; - padding: 9px 10px 11px; - line-height: 19px; - color: #999999; + padding: 10px 15px 10px; + color: #777777; text-decoration: none; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.navbar .btn { - display: inline-block; - padding: 4px 10px 4px; - margin: 5px 5px 6px; - line-height: 18px; + text-shadow: 0 1px 0 #ffffff; } -.navbar .btn-group { - margin: 0; - padding: 5px 5px 6px; +.navbar .nav .dropdown-toggle .caret { + margin-top: 8px; } +.navbar .nav > li > a:focus, .navbar .nav > li > a:hover { background-color: transparent; - color: #ffffff; + color: #333333; text-decoration: none; } -.navbar .nav .active > a, -.navbar .nav .active > a:hover { - color: #ffffff; +.navbar .nav > .active > a, +.navbar .nav > .active > a:hover, +.navbar .nav > .active > a:focus { + color: #555555; text-decoration: none; - background-color: #222222; -} -.navbar .divider-vertical { - height: 40px; - width: 1px; - margin: 0 9px; - overflow: hidden; - background-color: #222222; - border-right: 1px solid #333333; -} -.navbar .nav.pull-right { - margin-left: 10px; - margin-right: 0; + background-color: #e5e5e5; + -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); } .navbar .btn-navbar { display: none; @@ -2735,18 +3465,19 @@ input[type="submit"].btn.btn-mini { padding: 7px 10px; margin-left: 5px; margin-right: 5px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #ededed; + background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5)); + background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5); + background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5); + background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - border-color: #222222 #222222 #000000; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); + border-color: #e5e5e5 #e5e5e5 #bfbfbf; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #222222; + *background-color: #e5e5e5; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2755,16 +3486,18 @@ input[type="submit"].btn.btn-mini { box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); } .navbar .btn-navbar:hover, +.navbar .btn-navbar:focus, .navbar .btn-navbar:active, .navbar .btn-navbar.active, .navbar .btn-navbar.disabled, .navbar .btn-navbar[disabled] { - background-color: #222222; - *background-color: #151515; + color: #ffffff; + background-color: #e5e5e5; + *background-color: #d9d9d9; } .navbar .btn-navbar:active, .navbar .btn-navbar.active { - background-color: #080808 \9; + background-color: #cccccc \9; } .navbar .btn-navbar .icon-bar { display: block; @@ -2781,7 +3514,7 @@ input[type="submit"].btn.btn-mini { .btn-navbar .icon-bar + .icon-bar { margin-top: 3px; } -.navbar .dropdown-menu:before { +.navbar .nav > li > .dropdown-menu:before { content: ''; display: inline-block; border-left: 7px solid transparent; @@ -2792,7 +3525,7 @@ input[type="submit"].btn.btn-mini { top: -7px; left: 9px; } -.navbar .dropdown-menu:after { +.navbar .nav > li > .dropdown-menu:after { content: ''; display: inline-block; border-left: 6px solid transparent; @@ -2802,142 +3535,293 @@ input[type="submit"].btn.btn-mini { top: -6px; left: 10px; } -.navbar-fixed-bottom .dropdown-menu:before { +.navbar-fixed-bottom .nav > li > .dropdown-menu:before { border-top: 7px solid #ccc; border-top-color: rgba(0, 0, 0, 0.2); border-bottom: 0; bottom: -7px; top: auto; } -.navbar-fixed-bottom .dropdown-menu:after { +.navbar-fixed-bottom .nav > li > .dropdown-menu:after { border-top: 6px solid #ffffff; border-bottom: 0; bottom: -6px; top: auto; } -.navbar .nav li.dropdown .dropdown-toggle .caret, -.navbar .nav li.dropdown.open .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} -.navbar .nav li.dropdown.active .caret { - opacity: 1; - filter: alpha(opacity=100); +.navbar .nav li.dropdown > a:hover .caret, +.navbar .nav li.dropdown > a:focus .caret { + border-top-color: #333333; + border-bottom-color: #333333; } .navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.open.active > .dropdown-toggle { - background-color: transparent; + background-color: #e5e5e5; + color: #555555; } -.navbar .nav li.dropdown.active > .dropdown-toggle:hover { - color: #ffffff; +.navbar .nav li.dropdown > .dropdown-toggle .caret { + border-top-color: #777777; + border-bottom-color: #777777; +} +.navbar .nav li.dropdown.open > .dropdown-toggle .caret, +.navbar .nav li.dropdown.active > .dropdown-toggle .caret, +.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret { + border-top-color: #555555; + border-bottom-color: #555555; } -.navbar .pull-right .dropdown-menu, -.navbar .dropdown-menu.pull-right { +.navbar .pull-right > li > .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right { left: auto; right: 0; } -.navbar .pull-right .dropdown-menu:before, -.navbar .dropdown-menu.pull-right:before { +.navbar .pull-right > li > .dropdown-menu:before, +.navbar .nav > li > .dropdown-menu.pull-right:before { left: auto; right: 12px; } -.navbar .pull-right .dropdown-menu:after, -.navbar .dropdown-menu.pull-right:after { +.navbar .pull-right > li > .dropdown-menu:after, +.navbar .nav > li > .dropdown-menu.pull-right:after { left: auto; right: 13px; } -.breadcrumb { - padding: 7px 14px; - margin: 0 0 18px; - list-style: none; - background-color: #fbfbfb; - background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5)); - background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); - background-image: linear-gradient(top, #ffffff, #f5f5f5); +.navbar .pull-right > li > .dropdown-menu .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu { + left: auto; + right: 100%; + margin-left: 0; + margin-right: -1px; + -webkit-border-radius: 6px 0 6px 6px; + -moz-border-radius: 6px 0 6px 6px; + border-radius: 6px 0 6px 6px; +} +.navbar-inverse .navbar-inner { + background-color: #1b1b1b; + background-image: -moz-linear-gradient(top, #222222, #111111); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111)); + background-image: -webkit-linear-gradient(top, #222222, #111111); + background-image: -o-linear-gradient(top, #222222, #111111); + background-image: linear-gradient(to bottom, #222222, #111111); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); - border: 1px solid #ddd; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; -} -.breadcrumb li { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - text-shadow: 0 1px 0 #ffffff; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0); + border-color: #252525; } -.breadcrumb .divider { - padding: 0 5px; +.navbar-inverse .brand, +.navbar-inverse .nav > li > a { color: #999999; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } -.breadcrumb .active a { - color: #333333; -} -.pagination { - height: 36px; - margin: 18px 0; +.navbar-inverse .brand:hover, +.navbar-inverse .nav > li > a:hover, +.navbar-inverse .brand:focus, +.navbar-inverse .nav > li > a:focus { + color: #ffffff; } -.pagination ul { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - margin-left: 0; - margin-bottom: 0; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); +.navbar-inverse .brand { + color: #999999; } -.pagination li { - display: inline; +.navbar-inverse .navbar-text { + color: #999999; } -.pagination a { +.navbar-inverse .nav > li > a:focus, +.navbar-inverse .nav > li > a:hover { + background-color: transparent; + color: #ffffff; +} +.navbar-inverse .nav .active > a, +.navbar-inverse .nav .active > a:hover, +.navbar-inverse .nav .active > a:focus { + color: #ffffff; + background-color: #111111; +} +.navbar-inverse .navbar-link { + color: #999999; +} +.navbar-inverse .navbar-link:hover, +.navbar-inverse .navbar-link:focus { + color: #ffffff; +} +.navbar-inverse .divider-vertical { + border-left-color: #111111; + border-right-color: #222222; +} +.navbar-inverse .nav li.dropdown.open > .dropdown-toggle, +.navbar-inverse .nav li.dropdown.active > .dropdown-toggle, +.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle { + background-color: #111111; + color: #ffffff; +} +.navbar-inverse .nav li.dropdown > a:hover .caret, +.navbar-inverse .nav li.dropdown > a:focus .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; +} +.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret { + border-top-color: #999999; + border-bottom-color: #999999; +} +.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, +.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret, +.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; +} +.navbar-inverse .navbar-search .search-query { + color: #ffffff; + background-color: #515151; + border-color: #111111; + -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + -webkit-transition: none; + -moz-transition: none; + -o-transition: none; + transition: none; +} +.navbar-inverse .navbar-search .search-query:-moz-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query:-ms-input-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query:focus, +.navbar-inverse .navbar-search .search-query.focused { + padding: 5px 15px; + color: #333333; + text-shadow: 0 1px 0 #ffffff; + background-color: #ffffff; + border: 0; + -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + outline: 0; +} +.navbar-inverse .btn-navbar { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #0e0e0e; + background-image: -moz-linear-gradient(top, #151515, #040404); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404)); + background-image: -webkit-linear-gradient(top, #151515, #040404); + background-image: -o-linear-gradient(top, #151515, #040404); + background-image: linear-gradient(to bottom, #151515, #040404); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0); + border-color: #040404 #040404 #000000; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + *background-color: #040404; + /* Darken IE7 buttons by default so they stand out more given they won't have borders */ + + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +} +.navbar-inverse .btn-navbar:hover, +.navbar-inverse .btn-navbar:focus, +.navbar-inverse .btn-navbar:active, +.navbar-inverse .btn-navbar.active, +.navbar-inverse .btn-navbar.disabled, +.navbar-inverse .btn-navbar[disabled] { + color: #ffffff; + background-color: #040404; + *background-color: #000000; +} +.navbar-inverse .btn-navbar:active, +.navbar-inverse .btn-navbar.active { + background-color: #000000 \9; +} +.breadcrumb { + padding: 8px 15px; + margin: 0 0 20px; + list-style: none; + background-color: #f5f5f5; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.breadcrumb > li { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + text-shadow: 0 1px 0 #ffffff; +} +.breadcrumb > li > .divider { + padding: 0 5px; + color: #ccc; +} +.breadcrumb > .active { + color: #999999; +} +.pagination { + margin: 20px 0; +} +.pagination ul { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + margin-left: 0; + margin-bottom: 0; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); +} +.pagination ul > li { + display: inline; +} +.pagination ul > li > a, +.pagination ul > li > span { float: left; - padding: 0 14px; - line-height: 34px; + padding: 4px 12px; + line-height: 20px; text-decoration: none; - border: 1px solid #ddd; + background-color: #ffffff; + border: 1px solid #dddddd; border-left-width: 0; } -.pagination a:hover, -.pagination .active a { +.pagination ul > li > a:hover, +.pagination ul > li > a:focus, +.pagination ul > .active > a, +.pagination ul > .active > span { background-color: #f5f5f5; } -.pagination .active a { +.pagination ul > .active > a, +.pagination ul > .active > span { color: #999999; cursor: default; } -.pagination .disabled span, -.pagination .disabled a, -.pagination .disabled a:hover { +.pagination ul > .disabled > span, +.pagination ul > .disabled > a, +.pagination ul > .disabled > a:hover, +.pagination ul > .disabled > a:focus { color: #999999; background-color: transparent; cursor: default; } -.pagination li:first-child a { +.pagination ul > li:first-child > a, +.pagination ul > li:first-child > span { border-left-width: 1px; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } -.pagination li:last-child a { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; +.pagination ul > li:last-child > a, +.pagination ul > li:last-child > span { + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; } .pagination-centered { text-align: center; @@ -2945,9 +3829,63 @@ input[type="submit"].btn.btn-mini { .pagination-right { text-align: right; } +.pagination-large ul > li > a, +.pagination-large ul > li > span { + padding: 11px 19px; + font-size: 17.5px; +} +.pagination-large ul > li:first-child > a, +.pagination-large ul > li:first-child > span { + -webkit-border-top-left-radius: 6px; + -moz-border-radius-topleft: 6px; + border-top-left-radius: 6px; + -webkit-border-bottom-left-radius: 6px; + -moz-border-radius-bottomleft: 6px; + border-bottom-left-radius: 6px; +} +.pagination-large ul > li:last-child > a, +.pagination-large ul > li:last-child > span { + -webkit-border-top-right-radius: 6px; + -moz-border-radius-topright: 6px; + border-top-right-radius: 6px; + -webkit-border-bottom-right-radius: 6px; + -moz-border-radius-bottomright: 6px; + border-bottom-right-radius: 6px; +} +.pagination-mini ul > li:first-child > a, +.pagination-small ul > li:first-child > a, +.pagination-mini ul > li:first-child > span, +.pagination-small ul > li:first-child > span { + -webkit-border-top-left-radius: 3px; + -moz-border-radius-topleft: 3px; + border-top-left-radius: 3px; + -webkit-border-bottom-left-radius: 3px; + -moz-border-radius-bottomleft: 3px; + border-bottom-left-radius: 3px; +} +.pagination-mini ul > li:last-child > a, +.pagination-small ul > li:last-child > a, +.pagination-mini ul > li:last-child > span, +.pagination-small ul > li:last-child > span { + -webkit-border-top-right-radius: 3px; + -moz-border-radius-topright: 3px; + border-top-right-radius: 3px; + -webkit-border-bottom-right-radius: 3px; + -moz-border-radius-bottomright: 3px; + border-bottom-right-radius: 3px; +} +.pagination-small ul > li > a, +.pagination-small ul > li > span { + padding: 2px 10px; + font-size: 11.9px; +} +.pagination-mini ul > li > a, +.pagination-mini ul > li > span { + padding: 0 6px; + font-size: 10.5px; +} .pager { - margin-left: 0; - margin-bottom: 18px; + margin: 20px 0; list-style: none; text-align: center; *zoom: 1; @@ -2956,6 +3894,7 @@ input[type="submit"].btn.btn-mini { .pager:after { display: table; content: ""; + line-height: 0; } .pager:after { clear: both; @@ -2963,7 +3902,8 @@ input[type="submit"].btn.btn-mini { .pager li { display: inline; } -.pager a { +.pager li > a, +.pager li > span { display: inline-block; padding: 5px 14px; background-color: #fff; @@ -2972,34 +3912,27 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 15px; border-radius: 15px; } -.pager a:hover { +.pager li > a:hover, +.pager li > a:focus { text-decoration: none; background-color: #f5f5f5; } -.pager .next a { +.pager .next > a, +.pager .next > span { float: right; } -.pager .previous a { +.pager .previous > a, +.pager .previous > span { float: left; } -.pager .disabled a, -.pager .disabled a:hover { +.pager .disabled > a, +.pager .disabled > a:hover, +.pager .disabled > a:focus, +.pager .disabled > span { color: #999999; background-color: #fff; cursor: default; } -.modal-open .dropdown-menu { - z-index: 2050; -} -.modal-open .dropdown.open { - *z-index: 2050; -} -.modal-open .popover { - z-index: 2060; -} -.modal-open .tooltip { - z-index: 2070; -} .modal-backdrop { position: fixed; top: 0; @@ -3019,12 +3952,11 @@ input[type="submit"].btn.btn-mini { } .modal { position: fixed; - top: 50%; + top: 10%; left: 50%; z-index: 1050; - overflow: auto; width: 560px; - margin: -250px 0 0 -280px; + margin-left: -280px; background-color: #ffffff; border: 1px solid #999; border: 1px solid rgba(0, 0, 0, 0.3); @@ -3040,17 +3972,17 @@ input[type="submit"].btn.btn-mini { -webkit-background-clip: padding-box; -moz-background-clip: padding-box; background-clip: padding-box; + outline: none; } .modal.fade { -webkit-transition: opacity .3s linear, top .3s ease-out; -moz-transition: opacity .3s linear, top .3s ease-out; - -ms-transition: opacity .3s linear, top .3s ease-out; -o-transition: opacity .3s linear, top .3s ease-out; transition: opacity .3s linear, top .3s ease-out; top: -25%; } .modal.fade.in { - top: 50%; + top: 10%; } .modal-header { padding: 9px 15px; @@ -3059,7 +3991,12 @@ input[type="submit"].btn.btn-mini { .modal-header .close { margin-top: 2px; } +.modal-header h3 { + margin: 0; + line-height: 30px; +} .modal-body { + position: relative; overflow-y: auto; max-height: 400px; padding: 15px; @@ -3085,6 +4022,7 @@ input[type="submit"].btn.btn-mini { .modal-footer:after { display: table; content: ""; + line-height: 0; } .modal-footer:after { clear: both; @@ -3096,13 +4034,16 @@ input[type="submit"].btn.btn-mini { .modal-footer .btn-group .btn + .btn { margin-left: -1px; } +.modal-footer .btn-block + .btn-block { + margin-left: 0; +} .tooltip { position: absolute; - z-index: 1020; + z-index: 1030; display: block; visibility: visible; - padding: 5px; font-size: 11px; + line-height: 1.4; opacity: 0; filter: alpha(opacity=0); } @@ -3111,52 +4052,24 @@ input[type="submit"].btn.btn-mini { filter: alpha(opacity=80); } .tooltip.top { - margin-top: -2px; + margin-top: -3px; + padding: 5px 0; } .tooltip.right { - margin-left: 2px; + margin-left: 3px; + padding: 0 5px; } .tooltip.bottom { - margin-top: 2px; + margin-top: 3px; + padding: 5px 0; } .tooltip.left { - margin-left: -2px; -} -.tooltip.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; -} -.tooltip.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.tooltip.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; -} -.tooltip.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; + margin-left: -3px; + padding: 0 5px; } .tooltip-inner { max-width: 200px; - padding: 3px 8px; + padding: 8px; color: #ffffff; text-align: center; text-decoration: none; @@ -3169,100 +4082,36 @@ input[type="submit"].btn.btn-mini { position: absolute; width: 0; height: 0; + border-color: transparent; + border-style: solid; } -.popover { - position: absolute; - top: 0; - left: 0; - z-index: 1010; - display: none; - padding: 5px; -} -.popover.top { - margin-top: -5px; -} -.popover.right { - margin-left: 5px; -} -.popover.bottom { - margin-top: 5px; -} -.popover.left { - margin-left: -5px; -} -.popover.top .arrow { +.tooltip.top .tooltip-arrow { bottom: 0; left: 50%; margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; + border-width: 5px 5px 0; + border-top-color: #000000; } -.popover.right .arrow { +.tooltip.right .tooltip-arrow { top: 50%; left: 0; margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; -} -.popover.bottom .arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; + border-width: 5px 5px 5px 0; + border-right-color: #000000; } -.popover.left .arrow { +.tooltip.left .tooltip-arrow { top: 50%; right: 0; margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.popover .arrow { - position: absolute; - width: 0; - height: 0; -} -.popover-inner { - padding: 3px; - width: 280px; - overflow: hidden; - background: #000000; - background: rgba(0, 0, 0, 0.8); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -} -.popover-title { - padding: 9px 15px; - line-height: 1; - background-color: #f5f5f5; - border-bottom: 1px solid #eee; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; -} -.popover-content { - padding: 14px; - background-color: #ffffff; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; + border-width: 5px 0 5px 5px; + border-left-color: #000000; } -.popover-content p, -.popover-content ul, -.popover-content ol { - margin-bottom: 0; +.tooltip.bottom .tooltip-arrow { + top: 0; + left: 50%; + margin-left: -5px; + border-width: 0 5px 5px; + border-bottom-color: #000000; } .thumbnails { margin-left: -20px; @@ -3273,6 +4122,7 @@ input[type="submit"].btn.btn-mini { .thumbnails:after { display: table; content: ""; + line-height: 0; } .thumbnails:after { clear: both; @@ -3282,23 +4132,28 @@ input[type="submit"].btn.btn-mini { } .thumbnails > li { float: left; - margin-bottom: 18px; + margin-bottom: 20px; margin-left: 20px; } .thumbnail { display: block; padding: 4px; - line-height: 1; + line-height: 20px; border: 1px solid #ddd; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); -} -a.thumbnail:hover { - border-color: #b509b5; + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +a.thumbnail:hover, +a.thumbnail:focus { + border-color: #e73892; -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); @@ -3311,10 +4166,13 @@ a.thumbnail:hover { } .thumbnail .caption { padding: 9px; + color: #555555; } .label, .badge { - font-size: 10.998px; + display: inline-block; + padding: 2px 4px; + font-size: 11.844px; font-weight: bold; line-height: 14px; color: #ffffff; @@ -3324,19 +4182,25 @@ a.thumbnail:hover { background-color: #999999; } .label { - padding: 1px 4px 2px; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } .badge { - padding: 1px 9px 2px; + padding-left: 9px; + padding-right: 9px; -webkit-border-radius: 9px; -moz-border-radius: 9px; border-radius: 9px; } +.label:empty, +.badge:empty { + display: none; +} a.label:hover, -a.badge:hover { +a.label:focus, +a.badge:hover, +a.badge:focus { color: #ffffff; text-decoration: none; cursor: pointer; @@ -3381,9 +4245,18 @@ a.badge:hover { .badge-inverse[href] { background-color: #1a1a1a; } -@-webkit-keyframes progress-bar-stripes { - from { - background-position: 40px 0; +.btn .label, +.btn .badge { + position: relative; + top: -1px; +} +.btn-mini .label, +.btn-mini .badge { + top: 0; +} +@-webkit-keyframes progress-bar-stripes { + from { + background-position: 40px 0; } to { background-position: 0 0; @@ -3423,17 +4296,16 @@ a.badge:hover { } .progress { overflow: hidden; - height: 18px; - margin-bottom: 18px; + height: 20px; + margin-bottom: 20px; background-color: #f7f7f7; background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0); -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); @@ -3443,41 +4315,43 @@ a.badge:hover { } .progress .bar { width: 0%; - height: 18px; + height: 100%; color: #ffffff; + float: left; font-size: 12px; text-align: center; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #0e90d2; background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -ms-linear-gradient(top, #149bdf, #0480be); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); background-image: -webkit-linear-gradient(top, #149bdf, #0480be); background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(top, #149bdf, #0480be); + background-image: linear-gradient(to bottom, #149bdf, #0480be); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; -webkit-transition: width 0.6s ease; -moz-transition: width 0.6s ease; - -ms-transition: width 0.6s ease; -o-transition: width 0.6s ease; transition: width 0.6s ease; } +.progress .bar + .bar { + -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); + -moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); + box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); +} .progress-striped .bar { background-color: #149bdf; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -webkit-background-size: 40px 40px; -moz-background-size: 40px 40px; -o-background-size: 40px 40px; @@ -3490,88 +4364,88 @@ a.badge:hover { -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; } -.progress-danger .bar { +.progress-danger .bar, +.progress .bar-danger { background-color: #dd514c; background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(top, #ee5f5b, #c43c35); + background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0); } -.progress-danger.progress-striped .bar { +.progress-danger.progress-striped .bar, +.progress-striped .bar-danger { background-color: #ee5f5b; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-success .bar { +.progress-success .bar, +.progress .bar-success { background-color: #5eb95e; background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); background-image: -webkit-linear-gradient(top, #62c462, #57a957); background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); + background-image: linear-gradient(to bottom, #62c462, #57a957); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0); } -.progress-success.progress-striped .bar { +.progress-success.progress-striped .bar, +.progress-striped .bar-success { background-color: #62c462; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-info .bar { +.progress-info .bar, +.progress .bar-info { background-color: #4bb1cf; background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(top, #5bc0de, #339bb9); + background-image: linear-gradient(to bottom, #5bc0de, #339bb9); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0); } -.progress-info.progress-striped .bar { +.progress-info.progress-striped .bar, +.progress-striped .bar-info { background-color: #5bc0de; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-warning .bar { +.progress-warning .bar, +.progress .bar-warning { background-color: #faa732; background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-linear-gradient(top, #fbb450, #f89406); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); background-image: -webkit-linear-gradient(top, #fbb450, #f89406); background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(top, #fbb450, #f89406); + background-image: linear-gradient(to bottom, #fbb450, #f89406); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); } -.progress-warning.progress-striped .bar { +.progress-warning.progress-striped .bar, +.progress-striped .bar-warning { background-color: #fbb450; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .accordion { - margin-bottom: 18px; + margin-bottom: 20px; } .accordion-group { margin-bottom: 2px; @@ -3596,7 +4470,7 @@ a.badge:hover { } .carousel { position: relative; - margin-bottom: 18px; + margin-bottom: 20px; line-height: 1; } .carousel-inner { @@ -3604,47 +4478,47 @@ a.badge:hover { width: 100%; position: relative; } -.carousel .item { +.carousel-inner > .item { display: none; position: relative; -webkit-transition: 0.6s ease-in-out left; -moz-transition: 0.6s ease-in-out left; - -ms-transition: 0.6s ease-in-out left; -o-transition: 0.6s ease-in-out left; transition: 0.6s ease-in-out left; } -.carousel .item > img { +.carousel-inner > .item > img, +.carousel-inner > .item > a > img { display: block; line-height: 1; } -.carousel .active, -.carousel .next, -.carousel .prev { +.carousel-inner > .active, +.carousel-inner > .next, +.carousel-inner > .prev { display: block; } -.carousel .active { +.carousel-inner > .active { left: 0; } -.carousel .next, -.carousel .prev { +.carousel-inner > .next, +.carousel-inner > .prev { position: absolute; top: 0; width: 100%; } -.carousel .next { +.carousel-inner > .next { left: 100%; } -.carousel .prev { +.carousel-inner > .prev { left: -100%; } -.carousel .next.left, -.carousel .prev.right { +.carousel-inner > .next.left, +.carousel-inner > .prev.right { left: 0; } -.carousel .active.left { +.carousel-inner > .active.left { left: -100%; } -.carousel .active.right { +.carousel-inner > .active.right { left: 100%; } .carousel-control { @@ -3671,28 +4545,62 @@ a.badge:hover { left: auto; right: 15px; } -.carousel-control:hover { +.carousel-control:hover, +.carousel-control:focus { color: #ffffff; text-decoration: none; opacity: 0.9; filter: alpha(opacity=90); } +.carousel-indicators { + position: absolute; + top: 15px; + right: 15px; + z-index: 5; + margin: 0; + list-style: none; +} +.carousel-indicators li { + display: block; + float: left; + width: 10px; + height: 10px; + margin-left: 5px; + text-indent: -999px; + background-color: #ccc; + background-color: rgba(255, 255, 255, 0.25); + border-radius: 5px; +} +.carousel-indicators .active { + background-color: #fff; +} .carousel-caption { position: absolute; left: 0; right: 0; bottom: 0; - padding: 10px 15px 5px; + padding: 15px; background: #333333; background: rgba(0, 0, 0, 0.75); } .carousel-caption h4, .carousel-caption p { color: #ffffff; + line-height: 20px; +} +.carousel-caption h4 { + margin: 0 0 5px; +} +.carousel-caption p { + margin-bottom: 0; } .hero-unit { padding: 60px; margin-bottom: 30px; + font-size: 18px; + font-weight: 200; + line-height: 30px; + color: inherit; background-color: #eeeeee; -webkit-border-radius: 6px; -moz-border-radius: 6px; @@ -3705,1500 +4613,2030 @@ a.badge:hover { color: inherit; letter-spacing: -1px; } -.hero-unit p { - font-size: 18px; - font-weight: 200; - line-height: 27px; - color: inherit; -} -.pull-right { - float: right; -} -.pull-left { - float: left; +.hero-unit li { + line-height: 30px; } -.hide { +.popover { + position: absolute; + top: 0; + left: 0; + z-index: 1010; display: none; + max-width: 276px; + padding: 1px; + text-align: left; + background-color: #ffffff; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + white-space: normal; } -.show { - display: block; +.popover.top { + margin-top: -10px; } -.invisible { - visibility: hidden; +.popover.right { + margin-left: 10px; } -/* Font Awesome - the iconic font designed for use with Twitter Bootstrap - ------------------------------------------------------- - The full suite of pictographic icons, examples, and documentation - can be found at: http://fortawesome.github.com/Font-Awesome/ - - License - ------------------------------------------------------- - The Font Awesome webfont, CSS, and LESS files are licensed under CC BY 3.0: - http://creativecommons.org/licenses/by/3.0/ A mention of - 'Font Awesome - http://fortawesome.github.com/Font-Awesome' in human-readable - source code is considered acceptable attribution (most common on the web). - If human readable source code is not available to the end user, a mention in - an 'About' or 'Credits' screen is considered acceptable (most common in desktop - or mobile software). - - Contact - ------------------------------------------------------- - Email: dave@davegandy.com - Twitter: http://twitter.com/fortaweso_me - Work: Lead Product Designer @ http://kyruus.com - - */ -@font-face { - font-family: 'FontAwesome'; - src: url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.eot'); - src: url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.woff') format('woff'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.ttf') format('truetype'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.svg#FontAwesome') format('svg'); - font-weight: normal; - font-style: normal; +.popover.bottom { + margin-top: 10px; } -/* Font Awesome styles - ------------------------------------------------------- */ -[class^="icon-"]:before, -[class*=" icon-"]:before { - font-family: FontAwesome; +.popover.left { + margin-left: -10px; +} +.popover-title { + margin: 0; + padding: 8px 14px; + font-size: 14px; font-weight: normal; - font-style: normal; - display: inline-block; - text-decoration: inherit; + line-height: 18px; + background-color: #f7f7f7; + border-bottom: 1px solid #ebebeb; + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; } -a [class^="icon-"], -a [class*=" icon-"] { - display: inline-block; - text-decoration: inherit; +.popover-title:empty { + display: none; } -/* makes the font 33% larger relative to the icon container */ -.icon-large:before { - vertical-align: middle; - font-size: 1.3333333333333333em; +.popover-content { + padding: 9px 14px; } -.btn [class^="icon-"], -.nav-tabs [class^="icon-"], -.btn [class*=" icon-"], -.nav-tabs [class*=" icon-"] { - /* keeps button heights with and without icons the same */ - - line-height: .9em; +.popover .arrow, +.popover .arrow:after { + position: absolute; + display: block; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; } -li [class^="icon-"], -li [class*=" icon-"] { - display: inline-block; - width: 1.25em; - text-align: center; +.popover .arrow { + border-width: 11px; } -li .icon-large:before, -li .icon-large:before { - /* 1.5 increased font size for icon-large * 1.25 width */ - - width: 1.875em; +.popover .arrow:after { + border-width: 10px; + content: ""; } -ul.icons { - list-style-type: none; - margin-left: 2em; - text-indent: -0.8em; +.popover.top .arrow { + left: 50%; + margin-left: -11px; + border-bottom-width: 0; + border-top-color: #999; + border-top-color: rgba(0, 0, 0, 0.25); + bottom: -11px; +} +.popover.top .arrow:after { + bottom: 1px; + margin-left: -10px; + border-bottom-width: 0; + border-top-color: #ffffff; } -ul.icons li [class^="icon-"], -ul.icons li [class*=" icon-"] { - width: .8em; +.popover.right .arrow { + top: 50%; + left: -11px; + margin-top: -11px; + border-left-width: 0; + border-right-color: #999; + border-right-color: rgba(0, 0, 0, 0.25); } -ul.icons li .icon-large:before, -ul.icons li .icon-large:before { - /* 1.5 increased font size for icon-large * 1.25 width */ - - vertical-align: initial; +.popover.right .arrow:after { + left: 1px; + bottom: -10px; + border-left-width: 0; + border-right-color: #ffffff; } -/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen - readers do not read off random characters that represent icons */ -.icon-glass:before { - content: "\f000"; +.popover.bottom .arrow { + left: 50%; + margin-left: -11px; + border-top-width: 0; + border-bottom-color: #999; + border-bottom-color: rgba(0, 0, 0, 0.25); + top: -11px; } -.icon-music:before { - content: "\f001"; +.popover.bottom .arrow:after { + top: 1px; + margin-left: -10px; + border-top-width: 0; + border-bottom-color: #ffffff; } -.icon-search:before { - content: "\f002"; +.popover.left .arrow { + top: 50%; + right: -11px; + margin-top: -11px; + border-right-width: 0; + border-left-color: #999; + border-left-color: rgba(0, 0, 0, 0.25); } -.icon-envelope:before { - content: "\f003"; +.popover.left .arrow:after { + right: 1px; + border-right-width: 0; + border-left-color: #ffffff; + bottom: -10px; } -.icon-heart:before { - content: "\f004"; +.pull-right { + float: right; } -.icon-star:before { - content: "\f005"; +.pull-left { + float: left; } -.icon-star-empty:before { - content: "\f006"; +.hide { + display: none; } -.icon-user:before { - content: "\f007"; +.show { + display: block; } -.icon-film:before { - content: "\f008"; +.invisible { + visibility: hidden; } -.icon-th-large:before { - content: "\f009"; +.affix { + position: fixed; } -.icon-th:before { - content: "\f00a"; +.tag { + display: inline-block; + margin-bottom: 4px; + color: #111111; + background-color: #f6f6f6; + padding: 1px 10px; + border: 1px solid #dddddd; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; + -webkit-box-shadow: inset 0 1px 0 #ffffff; + -moz-box-shadow: inset 0 1px 0 #ffffff; + box-shadow: inset 0 1px 0 #ffffff; } -.icon-th-list:before { - content: "\f00b"; +a.tag:hover { + text-decoration: none; + color: #fff; + background-color: #ec66ab; + border: 1px solid #e73892; + -webkit-box-shadow: inset 0 1px 0 #f293c4; + -moz-box-shadow: inset 0 1px 0 #f293c4; + box-shadow: inset 0 1px 0 #f293c4; } -.icon-ok:before { - content: "\f00c"; +.pill { + display: inline-block; + background-color: #6f8890; + color: #ffffff; + padding: 2px 10px 1px 10px; + margin-right: 5px; + font-weight: normal; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; } -.icon-remove:before { - content: "\f00d"; +.pill a { + color: #ffffff; } -.icon-zoom-in:before { - content: "\f00e"; +.pill a.remove { + font-size: 11px; } -.icon-zoom-out:before { - content: "\f010"; +.unstyled { + margin: 0; + list-style: none; } -.icon-off:before { - content: "\f011"; +.simple-item { + font-size: 12px; + line-height: 1.1666666666666667em; + padding: 7px 25px; + border-bottom: 1px dotted #dddddd; } -.icon-signal:before { - content: "\f012"; +.simple-item:last-of-type { + border-bottom: 0; } -.icon-cog:before { - content: "\f013"; +.simple-list { + *zoom: 1; + margin: 0; + list-style: none; } -.icon-trash:before { - content: "\f014"; +.simple-list:before, +.simple-list:after { + display: table; + content: ""; + line-height: 0; } -.icon-home:before { - content: "\f015"; +.simple-list:after { + clear: both; } -.icon-file:before { - content: "\f016"; +.simple-list > li { + font-size: 12px; + line-height: 1.1666666666666667em; + padding: 7px 25px; + border-bottom: 1px dotted #dddddd; } -.icon-time:before { - content: "\f017"; +.simple-list > li:last-of-type { + border-bottom: 0; } -.icon-road:before { - content: "\f018"; +.simple-list .ckan-icon { + position: relative; + top: 0px; } -.icon-download-alt:before { - content: "\f019"; +.module-narrow .simple-list > li { + padding-left: 15px; + padding-right: 15px; + position: relative; } -.icon-download:before { - content: "\f01a"; +.listing li { + text-align: right; + margin-bottom: 5px; } -.icon-upload:before { - content: "\f01b"; +.listing .key { + clear: right; + font-weight: bold; } -.icon-inbox:before { - content: "\f01c"; +.js .tab-content { + display: none; } -.icon-play-circle:before { - content: "\f01d"; +.js .tab-content.active { + display: block; } -.icon-repeat:before { - content: "\f01e"; +.box { + background-color: #FFF; + border: 1px solid #cccccc; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); } -/* \f020 doesn't work in Safari. all shifted one down */ -.icon-refresh:before { - content: "\f021"; +.module { + margin: 20px 0; } -.icon-list-alt:before { - content: "\f022"; +.module-heading { + *zoom: 1; + margin: 0; + padding: 7px 25px; + font-size: 14px; + line-height: 1.3; + background-color: #f6f6f6; + border-top: 1px solid #dddddd; + border-bottom: 1px solid #dddddd; } -.icon-lock:before { - content: "\f023"; +.module-heading:before, +.module-heading:after { + display: table; + content: ""; + line-height: 0; } -.icon-flag:before { - content: "\f024"; +.module-heading:after { + clear: both; } -.icon-headphones:before { - content: "\f025"; +.module-heading .action { + float: right; + color: #888888; + font-size: 12px; + line-height: 20px; + text-decoration: underline; } -.icon-volume-off:before { - content: "\f026"; +.module-heading .action:hover { + color: #444444; } -.icon-volume-down:before { - content: "\f027"; +.module-content { + padding: 0 25px; + margin: 20px 0; } -.icon-volume-up:before { - content: "\f028"; +.module-content:first-child { + margin-top: 0; + padding-top: 20px; } -.icon-qrcode:before { - content: "\f029"; +.module-content:last-child { + margin-bottom: 0; + padding-bottom: 20px; } -.icon-barcode:before { - content: "\f02a"; +.module-content > :last-child { + margin-bottom: 0; } -.icon-tag:before { - content: "\f02b"; +.module:first-child .module-heading { + -webkit-border-radius: 3px 0 0 0; + -moz-border-radius: 3px 0 0 0; + border-radius: 3px 0 0 0; + border-top-width: 0; } -.icon-tags:before { - content: "\f02c"; +.module:last-child { + margin-bottom: 20px; } -.icon-book:before { - content: "\f02d"; +.module-footer { + padding: 7px 25px 7px; + margin: 0; + border-top: 1px dotted #dddddd; } -.icon-bookmark:before { - content: "\f02e"; +.module .read-more { + font-weight: bold; + color: #000000; } -.icon-print:before { - content: "\f02f"; +.module .pagination { + height: 34px; + margin-bottom: 0; + border-top: 1px solid #dddddd; } -.icon-camera:before { - content: "\f030"; +.module-content .pagination { + margin-left: -25px; + margin-right: -25px; + margin-bottom: -20px; } -.icon-font:before { - content: "\f031"; +.module .pagination > ul { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + border: 0; } -.icon-bold:before { - content: "\f032"; +.module .pagination li a { + border-top: none; + border-bottom: none; + padding-top: 7px; + padding-bottom: 7px; } -.icon-italic:before { - content: "\f033"; +.module .pagination li:first-child a, +.module .pagination li:last-child a { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } -.icon-text-height:before { - content: "\f034"; +.module .pagination li:first-child a { + border-left-width: 0; } -.icon-text-width:before { - content: "\f035"; +.module .pagination li:last-child a { + border-right-width: 0; } -.icon-align-left:before { - content: "\f036"; +.module .pagination li.active a { + border-left-width: 1px; + border-right-width: 1px; } -.icon-align-center:before { - content: "\f037"; +.module-content-shallow { + padding: 0; + margin-top: 10px; + padding-bottom: 10px; } -.icon-align-right:before { - content: "\f038"; +.module h1 { + margin-bottom: 20px; } -.icon-align-justify:before { - content: "\f039"; +.module-shallow .module-content { + padding: 10px; + margin: 0; } -.icon-list:before { - content: "\f03a"; +.module-shallow .module-tags { + margin-top: 0; + margin-bottom: 0; } -.icon-indent-left:before { - content: "\f03b"; +.module-shallow .module-content:first-child { + padding-top: 10px; } -.icon-indent-right:before { - content: "\f03c"; +.module-shallow .module-content:last-child { + padding-bottom: 10px; } -.icon-facetime-video:before { - content: "\f03d"; +.module-narrow .module-heading, +.module-narrow .module-content, +.module-narrow .module-footer { + padding-left: 15px; + padding-right: 15px; } -.icon-picture:before { - content: "\f03e"; +.module-grid { + margin: 0; + list-style: none; + *zoom: 1; + margin: 0 -25px; + padding-bottom: 15px; + background: #fbfbfb url("../../../base/images/bg.png"); + border: 1px solid #dddddd; + border-width: 1px 0; } -.icon-pencil:before { - content: "\f040"; +.module-grid:before, +.module-grid:after { + display: table; + content: ""; + line-height: 0; } -.icon-map-marker:before { - content: "\f041"; +.module-grid:after { + clear: both; } -.icon-adjust:before { - content: "\f042"; +.module-item { + width: 189px; + padding: 15px; + margin: 15px 0 0 15px; + background-color: white; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + float: left; + margin-left: 20px; + width: 460px; + padding-top: 10px; + padding-bottom: 10px; + padding-right: 50px; + overflow: hidden; + position: relative; } -.icon-tint:before { - content: "\f043"; +.module-item span.count { + color: #999; } -.icon-edit:before { - content: "\f044"; +.module-item .media-image { + margin-bottom: 5px; } -.icon-share:before { - content: "\f045"; +.module-item .media-edit { + opacity: 0; + position: absolute; + right: 15px; + bottom: 15px; + -webkit-transition: opacity 0.2s ease-in; + -moz-transition: opacity 0.2s ease-in; + -o-transition: opacity 0.2s ease-in; + transition: opacity 0.2s ease-in; } -.icon-check:before { - content: "\f046"; +.module-item:hover { + z-index: 1; } -.icon-move:before { - content: "\f047"; +.module-item:hover .media-edit { + opacity: 1; } -.icon-step-backward:before { - content: "\f048"; +.module-item.first { + clear: left; } -.icon-fast-backward:before { - content: "\f049"; +.group .content img { + margin: 0 -5px 5px; + max-width: initial; } -.icon-backward:before { - content: "\f04a"; +.group .content h3 { + font-size: 14px; + line-height: 1.3; } -.icon-play:before { - content: "\f04b"; +.group-listing { + margin-left: -20px; } -.icon-pause:before { - content: "\f04c"; +.ckanext-datapreview { + position: relative; } -.icon-stop:before { - content: "\f04d"; +.ckanext-datapreview > iframe { + min-height: 400px; } -.icon-forward:before { - content: "\f04e"; +.ckanext-datapreview > img { + max-height: 500px; + max-width: 100%; + overflow: hidden; } -.icon-fast-forward:before { - content: "\f050"; +.package-info h4 { + margin-bottom: 10px; } -.icon-step-forward:before { - content: "\f051"; +.module-resource { + background-color: #ffffff; + border-bottom: 1px solid #dddddd; + margin-top: 0; + margin-bottom: 0; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } -.icon-eject:before { - content: "\f052"; +.module-resource .actions { + position: relative; + float: right; + top: -10px; + right: -15px; } -.icon-chevron-left:before { - content: "\f053"; +.module .module-tags { + padding-bottom: 8px; } -.icon-chevron-right:before { - content: "\f054"; +.secondary .module:first-child, +.primary .module:first-child { + margin-top: 0; } -.icon-plus-sign:before { - content: "\f055"; +.no-nav .module:last-child { + margin-top: 0; } -.icon-minus-sign:before { - content: "\f056"; +.module-image { + float: left; + width: 50px; + height: 50px; + line-height: 50px; + text-align: center; + margin-right: 15px; } -.icon-remove-sign:before { - content: "\f057"; +.module-image img { + max-width: 50px; + max-height: 50px; + vertical-align: middle; } -.icon-ok-sign:before { - content: "\f058"; +.banner { + -webkit-transform: rotate(45deg); + -moz-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); + -webkit-transform-origin: center center; + -moz-transform-origin: center center; + -ms-transform-origin: center center; + -o-transform-origin: center center; + transform-origin: center center; + position: absolute; + top: 15px; + right: -35px; + width: 80px; + color: #ffffff; + background-color: #e73892; + padding: 1px 20px; + font-size: 11px; + text-align: center; + text-transform: uppercase; } -.icon-question-sign:before { - content: "\f059"; +.media-grid { + margin: 0; + list-style: none; + *zoom: 1; + margin: 0 -25px; + padding-bottom: 15px; + background: #fbfbfb url("../../../base/images/bg.png"); + border: 1px solid #dddddd; + border-width: 1px 0; } -.icon-info-sign:before { - content: "\f05a"; +.media-grid:before, +.media-grid:after { + display: table; + content: ""; + line-height: 0; } -.icon-screenshot:before { - content: "\f05b"; +.media-grid:after { + clear: both; } -.icon-remove-circle:before { - content: "\f05c"; +.media-item { + position: relative; + float: left; + width: 189px; + padding: 15px; + margin: 15px 0 0 15px; + background-color: white; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.icon-ok-circle:before { - content: "\f05d"; +.media-item span.count { + color: #999; } -.icon-ban-circle:before { - content: "\f05e"; +.media-item .media-image { + margin-bottom: 5px; } -.icon-arrow-left:before { - content: "\f060"; +.media-item .media-edit { + opacity: 0; + position: absolute; + right: 15px; + bottom: 15px; + -webkit-transition: opacity 0.2s ease-in; + -moz-transition: opacity 0.2s ease-in; + -o-transition: opacity 0.2s ease-in; + transition: opacity 0.2s ease-in; } -.icon-arrow-right:before { - content: "\f061"; +.media-item:hover { + z-index: 1; } -.icon-arrow-up:before { - content: "\f062"; +.media-item:hover .media-edit { + opacity: 1; } -.icon-arrow-down:before { - content: "\f063"; +.media-view { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + border: 1px solid #dddddd; + overflow: hidden; + -webkit-transition: all 0.2s ease-in; + -moz-transition: all 0.2s ease-in; + -o-transition: all 0.2s ease-in; + transition: all 0.2s ease-in; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.icon-share-alt:before { - content: "\f064"; +.media-view:hover, +.media-view.hovered { + border-color: #e73892; + -webkit-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.1); + box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.1); } -.icon-resize-full:before { - content: "\f065"; +.media-view:hover .banner, +.media-view.hovered .banner { + background-color: #e73892; } -.icon-resize-small:before { - content: "\f066"; +.media-view span { + display: none; } -.icon-plus:before { - content: "\f067"; +.media-view .banner { + display: block; + background-color: #b7b7b7; + -webkit-transition: background-color 0.2s ease-in; + -moz-transition: background-color 0.2s ease-in; + -o-transition: background-color 0.2s ease-in; + transition: background-color 0.2s ease-in; } -.icon-minus:before { - content: "\f068"; +.media-image { + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } -.icon-asterisk:before { - content: "\f069"; +.media-heading { + font-size: 18px; + line-height: 1.3; + margin: 5px 0; } -.icon-exclamation-sign:before { - content: "\f06a"; +.media-overlay { + position: relative; + min-height: 35px; } -.icon-gift:before { - content: "\f06b"; +.media-overlay .media-heading { + position: absolute; + left: 0; + right: 0; + bottom: 0; + padding: 12px 10px; + margin: 0; + background-color: #000; + background-color: rgba(0, 0, 0, 0.8); + font-size: 13px; + color: #fff; + z-index: 1; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; } -.icon-leaf:before { - content: "\f06c"; +.media-overlay .media-image { + float: none; + display: block; + margin-right: 0; } -.icon-fire:before { - content: "\f06d"; +.media-item.is-expander .truncator-link { + -webkit-transition: opacity 0.2s ease-in; + -moz-transition: opacity 0.2s ease-in; + -o-transition: opacity 0.2s ease-in; + transition: opacity 0.2s ease-in; + position: absolute; + z-index: 10; + left: 15px; + bottom: 15px; + opacity: 0; } -.icon-eye-open:before { - content: "\f06e"; +.media-item.is-expander:hover { + padding-bottom: 35px; } -.icon-eye-close:before { - content: "\f070"; +.media-item.is-expander:hover .truncator-link { + opacity: 1; } -.icon-warning-sign:before { - content: "\f071"; +.wide .media-item { + width: 186px; } -.icon-plane:before { - content: "\f072"; +.nav-simple, +.nav-aside { + *zoom: 1; + margin: 0; + list-style: none; + padding-bottom: 0; } -.icon-calendar:before { - content: "\f073"; +.nav-simple:before, +.nav-aside:before, +.nav-simple:after, +.nav-aside:after { + display: table; + content: ""; + line-height: 0; } -.icon-random:before { - content: "\f074"; +.nav-simple:after, +.nav-aside:after { + clear: both; } -.icon-comment:before { - content: "\f075"; +.nav-simple > li, +.nav-aside > li { + font-size: 12px; + line-height: 1.1666666666666667em; + padding: 7px 25px; + border-bottom: 1px dotted #dddddd; } -.icon-magnet:before { - content: "\f076"; +.nav-simple > li:last-of-type, +.nav-aside > li:last-of-type { + border-bottom: 0; } -.icon-chevron-up:before { - content: "\f077"; +.nav-simple .ckan-icon, +.nav-aside .ckan-icon { + position: relative; + top: 0px; } -.icon-chevron-down:before { - content: "\f078"; +.nav-aside { + border-top: 1px dotted #DDD; + border-bottom: 1px dotted #DDD; + margin-bottom: 15px; } -.icon-retweet:before { - content: "\f079"; +.nav-item > a, +.nav-aside li a { + color: #333333; + font-size: 14px; + line-height: 20px; + margin: -7px -25px; + padding: 7px 25px; } -.icon-shopping-cart:before { - content: "\f07a"; +.nav-item.active, +.nav-aside li.active { + background-color: #f6f6f6; } -.icon-folder-close:before { - content: "\f07b"; +.nav-item.active > a, +.nav-aside li.active a { + position: relative; + color: #ffffff; + background-color: #8ca0a6; } -.icon-folder-open:before { - content: "\f07c"; +.nav-item.active > a:hover, +.nav-aside li.active a:hover { + color: #ffffff; + background-color: #8ca0a6; } -.icon-resize-vertical:before { - content: "\f07d"; +.nav-item.active > a:before, +.nav-aside li.active a:before { + content: ' '; + position: absolute; + top: 0; + right: -6px; + width: 6px; + height: 34px; + background-image: url("../../../base/images/nav-active.png?1"); } -.icon-resize-horizontal:before { - content: "\f07e"; +.nav-item.active > a span, +.nav-aside li.active a span { + white-space: nowrap; + overflow: hidden; + display: block; } -.icon-bar-chart:before { - content: "\f080"; +.module-narrow .nav-item > a, +.module-narrow .nav-aside li a { + padding-left: 15px; + padding-right: 15px; + position: relative; } -.icon-twitter-sign:before { - content: "\f081"; +.module-narrow .nav-item.image, +.module-narrow .nav-aside li.image { + position: relative; } -.icon-facebook-sign:before { - content: "\f082"; +.module-narrow .nav-item.image > a, +.module-narrow .nav-aside li.image a { + padding-left: 42px; + padding-right: 42px; } -.icon-camera-retro:before { - content: "\f083"; +.module-narrow .nav-item.image > img, +.module-narrow .nav-aside li.image img { + position: absolute; + top: 50%; + left: 15px; + width: 20px; + height: 20px; + margin-top: -10px; + z-index: 2; } -.icon-key:before { - content: "\f084"; +.nav-facet .nav-item > a:hover:after, +.nav-facet .nav-item.active > a:after { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + content: ""; + position: absolute; + top: 50%; + right: 5px; + margin-top: -8px; } -.icon-cogs:before { - content: "\f085"; +.nav-facet .nav-item > a:hover:after { + width: 17px; + height: 17px; + background-position: -17px -16px; } -.icon-comments:before { - content: "\f086"; +.nav-facet .nav-item.active > a:after { + width: 17px; + height: 17px; + background-position: 0px -16px; + right: 3px; } -.icon-thumbs-up:before { - content: "\f087"; +.user-list { + margin: 0; + list-style: none; } -.icon-thumbs-down:before { - content: "\f088"; +.user-list li { + margin: 0 0 10px 0; } -.icon-star-half:before { - content: "\f089"; +.user-list .gravatar { + vertical-align: -4px; + margin-right: 3px; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; } -.icon-heart-empty:before { - content: "\f08a"; +.nav-facet-tertiary { + margin: 10px 0; } -.icon-signout:before { - content: "\f08b"; +.nav-facet-tertiary .module-heading { + margin-bottom: 5px; + padding: 8px 12px; + border-bottom-width: 0; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; } -.icon-linkedin-sign:before { - content: "\f08c"; +.nav-facet-tertiary .module-heading i { + display: none; } -.icon-pushpin:before { - content: "\f08d"; +.nav-facet-tertiary .module-footer { + padding: 8px 12px; + border-top-width: 0; } -.icon-external-link:before { - content: "\f08e"; +.nav-facet-tertiary .module-footer a { + font-weight: normal; + color: #8C8C8C; } -.icon-signin:before { - content: "\f090"; +.nav-facet-tertiary .nav { + margin-bottom: 0; } -.icon-trophy:before { - content: "\f091"; +.nav-facet-tertiary .module-content.empty { + padding: 8px 12px; + margin-top: 0; } -.icon-github-sign:before { - content: "\f092"; +.nav-facet-tertiary .nav li.active { + position: relative; } -.icon-upload-alt:before { - content: "\f093"; +.nav-facet-tertiary .nav li.active > a:hover:after, +.nav-facet-tertiary .nav li.active > a:after { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + width: 17px; + height: 17px; + background-position: 0px -16px; + content: ""; + position: absolute; + top: 50%; + right: 5px; + margin-top: -8px; } -.icon-lemon:before { - content: "\f094"; +.nav-simple > .nav-btn { + padding-left: 0; + padding-right: 0; + text-align: center; } -.icon-phone:before { - content: "\f095"; +.nav-simple > .nav-btn .btn { + display: inline-block; } -.icon-check-empty:before { - content: "\f096"; +.js .js-hide { + display: none; } -.icon-bookmark-empty:before { - content: "\f097"; +.js .js-hide.active { + display: block; } -.icon-phone-sign:before { - content: "\f098"; +.btn, +label { + font-weight: bold; } -.icon-twitter:before { - content: "\f099"; +.btn-rounded { + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; + padding-left: 15px; + padding-right: 15px; } -.icon-facebook:before { - content: "\f09a"; +label { + cursor: pointer; + font-size: 14px; } -.icon-github:before { - content: "\f09b"; +label:after { + content: ":"; } -.icon-unlock:before { - content: "\f09c"; +label.radio:after, +label.checkbox:after { + content: ""; } -.icon-credit-card:before { - content: "\f09d"; +input[type=radio], +input[type=checkbox] { + position: relative; + top: 7px; + padding: 0; + margin: 0; } -.icon-rss:before { - content: "\f09e"; +input[type=radio].checkbox-onown, +input[type=checkbox].checkbox-onown { + top: 0; } -.icon-hdd:before { - content: "\f0a0"; +select { + padding: 4px; } -.icon-bullhorn:before { - content: "\f0a1"; +textarea { + max-width: 100%; } -.icon-bell:before { - content: "\f0a2"; +.control-group .btn { + position: relative; + top: -2px; } -.icon-certificate:before { - content: "\f0a3"; +.control-full input, +.control-full select, +.control-full textarea { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + height: auto; + width: 100%; } -.icon-hand-right:before { - content: "\f0a4"; +.control-medium input, +.control-medium select, +.control-medium textarea { + width: 320px; } -.icon-hand-left:before { - content: "\f0a5"; +.control-large input, +.control-large .control-label { + font-size: 17.5px; + line-height: 30px; } -.icon-hand-up:before { - content: "\f0a6"; +.control-large input { + height: 41px; } -.icon-hand-down:before { - content: "\f0a7"; +.form-actions { + background: none; + margin-left: -25px; + margin-right: -25px; + margin-bottom: 0; + padding-bottom: 0; + text-align: right; } -.icon-circle-arrow-left:before { - content: "\f0a8"; +.form-actions .action-info { + float: left; + width: 50%; + line-height: 2; + text-align: left; + color: #707070; + margin: 0; } -.icon-circle-arrow-right:before { - content: "\f0a9"; +.form-actions .action-info.small { + font-size: 11px; + line-height: 1.2; } -.icon-circle-arrow-up:before { - content: "\f0aa"; +.form-horizontal .control-label { + width: 120px; } -.icon-circle-arrow-down:before { - content: "\f0ab"; +.form-horizontal .controls { + margin-left: 130px; } -.icon-globe:before { - content: "\f0ac"; +.form-horizontal .info-block { + position: relative; + display: block; + font-size: 11px; + color: #aaaaaa; + line-height: 1.3; + padding: 6px 0 6px 25px; + margin-top: 6px; } -.icon-wrench:before { - content: "\f0ad"; +.form-horizontal .info-help { + padding: 6px 0; } -.icon-tasks:before { - content: "\f0ae"; +.form-horizontal .info-help:before { + display: none; } -.icon-filter:before { - content: "\f0b0"; +.form-horizontal .info-help-tight { + margin-top: -10px; } -.icon-briefcase:before { - content: "\f0b1"; +.form-horizontal .info-inline { + float: right; + width: 265px; + margin-top: 0; + padding-bottom: 0; } -.icon-fullscreen:before { - content: "\f0b2"; +.form-horizontal .control-medium .info-block.info-inline { + width: 165px; } -.icon-group:before { - content: "\f0c0"; +.form-horizontal .info-block:before { + font-size: 2.2em; + position: absolute; + left: 0; + top: 2px; } -.icon-link:before { - content: "\f0c1"; +.form-horizontal .info-inline:before { + top: 8px; } -.icon-cloud:before { - content: "\f0c2"; +.info-block .icon-large, +.info-inline .icon-large { + float: left; + font-size: 22px; + margin-right: 15px; } -.icon-beaker:before { - content: "\f0c3"; +.form-horizontal .info-block a { + color: #aaaaaa; + text-decoration: underline; } -.icon-cut:before { - content: "\f0c4"; +.form-horizontal .form-actions { + padding-left: 25px; + padding-right: 25px; } -.icon-copy:before { - content: "\f0c5"; +.form-inline input { + padding-bottom: 9px; } -.icon-paper-clip:before { - content: "\f0c6"; -} -.icon-save:before { - content: "\f0c7"; +.form-inline select { + margin-top: 0; } -.icon-sign-blank:before { - content: "\f0c8"; +.form-inline .btn { + margin-left: 5px; } -.icon-reorder:before { - content: "\f0c9"; +.form-narrow label { + margin-bottom: 0; } -.icon-list-ul:before { - content: "\f0ca"; +.form-narrow select { + width: 100%; } -.icon-list-ol:before { - content: "\f0cb"; +.form-narrow .form-actions { + margin-left: -15px; + margin-right: -15px; + padding: 10px 15px 0; } -.icon-strikethrough:before { - content: "\f0cc"; +.form-select label { + margin-right: 5px; } -.icon-underline:before { - content: "\f0cd"; +.simple-input label, +.simple-input button { + display: none; } -.icon-table:before { - content: "\f0ce"; +.simple-input .field { + position: relative; } -.icon-magic:before { - content: "\f0d0"; +.simple-input .field-bordered { + border-bottom: 1px dotted #dddddd; } -.icon-truck:before { - content: "\f0d1"; +.simple-input .field input { + width: 100%; + height: auto; + margin: 0 -7px; + padding: 7px 5px; } -.icon-pinterest:before { - content: "\f0d2"; +.simple-input .field .btn-search { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + background-position: -51px -16px; + position: absolute; + display: block; + height: 17px; + width: 17px; + top: 50%; + right: 0; + margin-top: -8px; + background-color: transparent; + border: none; + text-indent: -999em; } -.icon-pinterest-sign:before { - content: "\f0d3"; +.editor textarea { + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; + border-bottom: none; } -.icon-google-plus-sign:before { - content: "\f0d4"; +.editor .editor-info-block { + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; + display: block; + float: none; + padding: 4px 10px; + background: #ebebeb; + width: auto; + border: 1px solid #cccccc; + border-top: none; + font-size: 11px; + color: #282828; } -.icon-google-plus:before { - content: "\f0d5"; +.editor .editor-info-block a { + color: #e73892; + text-decoration: none; } -.icon-money:before { - content: "\f0d6"; +.control-custom { + font-size: 0; } -.icon-caret-down:before { - content: "\f0d7"; +.control-custom label { + margin-bottom: 0; } -.icon-caret-up:before { - content: "\f0d8"; +.control-custom input { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + width: 140px; } -.icon-caret-left:before { - content: "\f0d9"; +.control-custom input:last-of-type { + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; } -.icon-caret-right:before { - content: "\f0da"; +.control-custom .checkbox { + display: inline-block; + margin-left: 5px; } -.icon-columns:before { - content: "\f0db"; +.control-custom .checkbox input { + width: auto; } -.icon-sort:before { - content: "\f0dc"; +.control-custom.disabled label, +.control-custom.disabled input { + color: #aaaaaa; + text-decoration: line-through; + text-shadow: none; } -.icon-sort-down:before { - content: "\f0dd"; +.control-custom.disabled input { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + background-color: #f3f3f3; } -.icon-sort-up:before { - content: "\f0de"; +.control-custom.disabled .checkbox { + color: #444444; + text-decoration: none; } -.icon-envelope-alt:before { - content: "\f0e0"; +.control-custom .checkbox.btn { + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; + position: relative; + top: 0; + left: 5px; + height: 1px; + width: 9px; + padding: 3px 8px; + line-height: 18px; } -.icon-linkedin:before { - content: "\f0e1"; +.control-custom .checkbox.btn span { + display: none; + width: 30px; } -.icon-undo:before { - content: "\f0e2"; +.control-custom .checkbox.btn:before { + position: relative; + top: 1px; + left: -1px; + color: #fff; } -.icon-legal:before { - content: "\f0e3"; +.control-custom .checkbox.btn input { + display: none; } -.icon-dashboard:before { - content: "\f0e4"; +.control-custom.disabled .checkbox.btn { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #ea53a1; + background-image: -moz-linear-gradient(top, #ec66ab, #e73892); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ec66ab), to(#e73892)); + background-image: -webkit-linear-gradient(top, #ec66ab, #e73892); + background-image: -o-linear-gradient(top, #ec66ab, #e73892); + background-image: linear-gradient(to bottom, #ec66ab, #e73892); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffec66ab', endColorstr='#ffe73892', GradientType=0); + border-color: #e73892 #e73892 #bc176c; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + *background-color: #e73892; + /* Darken IE7 buttons by default so they stand out more given they won't have borders */ + + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } -.icon-comment-alt:before { - content: "\f0e5"; +.control-custom.disabled .checkbox.btn:hover, +.control-custom.disabled .checkbox.btn:focus, +.control-custom.disabled .checkbox.btn:active, +.control-custom.disabled .checkbox.btn.active, +.control-custom.disabled .checkbox.btn.disabled, +.control-custom.disabled .checkbox.btn[disabled] { + color: #ffffff; + background-color: #e73892; + *background-color: #e42186; } -.icon-comments-alt:before { - content: "\f0e6"; +.control-custom.disabled .checkbox.btn:active, +.control-custom.disabled .checkbox.btn.active { + background-color: #d31979 \9; } -.icon-bolt:before { - content: "\f0e7"; +.control-custom.disabled .checkbox.btn .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; } -.icon-sitemap:before { - content: "\f0e8"; +.alert-danger a, +.alert-error a { + color: #b55457; } -.icon-umbrella:before { - content: "\f0e9"; +.control-group.error input, +.control-group.error select, +.control-group.error textarea, +.control-group.error .input-prepend .add-on, +.control-group.error .input-append .add-on { + border-color: #c6898b; } -.icon-paste:before { - content: "\f0ea"; +.error-inline { + color: #b55457; } -.icon-user-md:before { - content: "\f200"; +.error-block, +.error-inline { + font-size: 12px; } -.pill { - background-color: #cccccc; +.error-block { + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; + display: block; + padding: 6px 8px 3px; + background: #c6898b; + margin: -3px 0 0; color: #ffffff; - padding: 1px 5px 1px 8px; - margin-right: 5px; - -webkit-border-radius: 7px; - -moz-border-radius: 7px; - border-radius: 7px; + width: 208px; } -.pill a { - color: #ffffff; +.control-medium .error-block { + width: 318px; } -.pill a.remove { - font-size: 11px; +.control-full .error-block { + width: auto; } -.tag { - background: url("../../../base/images/background-tag.png") no-repeat -13px center; - position: relative; - display: block; - font-size: 11px; - line-height: 27px; - color: #b509b5; - padding-left: 10px; - padding-right: 5px; - margin-right: 11px; +.control-group.error .input-prepend .error-block, +.control-custom.error .error-block { + width: auto; } -.tag:before { - content: ""; - background: url("../../../base/images/background-tag.png") no-repeat center left; - position: absolute; - display: block; - top: 0; - bottom: 0; - right: -11px; - width: 11px; +.control-custom.error .error-block { + width: 401px; } -.unstyled { - margin: 0; - list-style: none; -} -.simple-item { - font-size: 12px; - line-height: 1.1666666666666667em; - padding: 7px 25px; - border-bottom: 1px dotted #cccccc; -} -.simple-item:last-of-type { - border-bottom: 0; +.control-select.error .error-block { + width: 196px; } -.simple-list { - *zoom: 1; +.stages { margin: 0; list-style: none; + *zoom: 1; + color: #aeaeae; + counter-reset: stage; + margin: -20px -25px 20px; + overflow: hidden; } -.simple-list:before, -.simple-list:after { +.stages:before, +.stages:after { display: table; content: ""; + line-height: 0; } -.simple-list:after { +.stages:after { clear: both; } -.simple-list > li { - font-size: 12px; - line-height: 1.1666666666666667em; - padding: 7px 25px; - border-bottom: 1px dotted #cccccc; +.stages li { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + line-height: 27px; + counter-increment: stage; + width: 33.33%; + background-color: #ededed; + float: left; + padding: 10px 20px; + position: relative; + z-index: 0; } -.simple-list > li:last-of-type { - border-bottom: 0; +.stages li:before { + -webkit-border-radius: 14px; + -moz-border-radius: 14px; + border-radius: 14px; + content: counter(stage); + display: inline-block; + width: 27px; + height: 27px; + margin-right: 5px; + font-weight: bold; + text-align: center; + color: #ffffff; + background-color: #aeaeae; + z-index: 1; } -.simple-list .ckan-icon { - position: relative; - top: 0px; +.stages li:after { + left: 0; + border: solid rgba(237, 237, 237, 0); + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; + border-top-color: #ededed; + border-bottom-color: #ededed; + border-width: 29px; + top: 50%; + margin-top: -29px; + margin-left: -30px; } -.module-narrow .simple-list > li { - padding-left: 15px; - padding-right: 15px; +.stages li.last { position: relative; + right: -1px; } -.listing li { - text-align: right; - margin-bottom: 5px; -} -.listing .key { - clear: right; - font-weight: bold; +.stages li.last, +.stages li.last .highlight { + -webkit-border-radius: 0 3px 0 0; + -moz-border-radius: 0 3px 0 0; + border-radius: 0 3px 0 0; } -.js .tab-content { - display: none; +.stages li.first:after { + content: none; + border: none; } -.js .tab-content.active { - display: block; +.stages li.active:after { + border-color: rgba(140, 198, 138, 0); + border-top-color: #8cc68a; + border-bottom-color: #8cc68a; } -.module { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); - background-color: #ffffff; - margin-bottom: 20px; +.stages li.complete:after { + border-color: rgba(197, 226, 196, 0); + border-top-color: #c5e2c4; + border-bottom-color: #c5e2c4; } -.module-heading { - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - font-size: 14px; - line-height: 1.3; - padding: 7px 25px; - border-bottom: 1px solid #d0d0d0; - background-color: #f3f3f3; - background-image: -moz-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -ms-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f0f0f0)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -o-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: linear-gradient(top, #f5f5f5, #f0f0f0); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f0f0f0', GradientType=0); +.stages.stage-3 li.complete:first-child:after { + content: none; } -.module-heading-secondary { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - border-top: 1px solid #d0d0d0; +.stages li.active, +.stages li.complete { + background: none; } -.module-heading [class^=icon]:before { - font-size: 1.2em; - line-height: 1; - position: relative; - top: 1px; - margin-right: 0.1em; +.stages li.active:before { + color: #8cc68a; + background: #ffffff; } -.module-heading .action { - float: right; - color: #8c8c8c; - font-size: 11px; - text-decoration: underline; +.stages li.complete:before { + color: #c5e2c4; + background: #eef6ed; } -.module-content { - padding: 0 25px; - margin: 20px 0; +.stages li .highlight { + display: block; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + width: 100%; + padding: 10px 52px; + border: none; + text-align: left; + text-decoration: none; + line-height: 27px; + z-index: -1; } -.module-content:first-child { - margin-top: 0; - padding-top: 20px; +.stages li.active .highlight { + color: #ffffff; + background: #8cc68a; } -.module-content:last-child { - margin-bottom: 0; - padding-bottom: 20px; +.stages li.complete .highlight { + color: #eef6ed; + background: #c5e2c4; } -.module-content > :last-child { +.alert > :last-child { margin-bottom: 0; } -.module-border-top { - border-top: 1px dotted #cccccc; +.slug-preview { + font-size: 14px; + line-height: 1.5; + margin-top: 5px; + margin-left: 10px; } -.module-border-bottom { - border-bottom: 1px dotted #cccccc; +.slug-preview-value { + background-color: #faedcf; + margin-right: 3px; } -.module-footer { - padding: 7px 25px 7px; - border-top: 1px dotted #cccccc; +.resource-upload-field { + position: relative; + overflow: hidden; + display: inline-block; + vertical-align: bottom; } -.module .read-more { - font-weight: bold; - color: #000000; +.resource-upload-field label { + z-index: 0; } -.module .pagination { - height: 34px; - margin-bottom: 0; - border-top: 1px solid #d0d0d0; +.resource-upload-field input { + opacity: 0; + filter: alpha(opacity=0); + position: absolute; + top: 0; + right: 0; + z-index: 1; + margin: 0; + border: solid transparent; + border-width: 100px 0 0 200px; + cursor: pointer; + direction: ltr; + -moz-transform: translate(-300px, 0) scale(4); } -.module .pagination > ul { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - border: 0; +.resource-upload-field.loading { + display: inline-block; + background: url("../../../base/images/loading-spinner.gif") no-repeat center right; + padding-right: 5px; } -.module .pagination li a { - border-top: none; - border-bottom: none; +.select2-container .select2-choice input, +.select2-container-multi .select2-choices .select2-search-field:first-child input { + font-size: 14px; } -.module .pagination li:first-child a, -.module .pagination li:last-child a { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; +.select2-container-multi .select2-choices .select2-search-field input { + height: 29px; } -.module .pagination li:first-child a { - border-left-width: 0; +.select2-container .select2-choice input, +.select2-container-multi .select2-choices .select2-search-field:first-child input { + padding-left: 10px; } -.module .pagination li:last-child a { - border-right-width: 0; +.select2-container { + margin-top: 1px; } -.module .pagination li.active a { - border-left-width: 1px; - border-right-width: 1px; +.select2-container-multi { + margin-top: 0; } -.module .action { - text-align: center; +.select2-container-multi .select2-choices .select2-search-choice { + padding: 5px 8px 5px 22px; } -.module-shallow .module-content { - padding: 10px; - margin: 0; +.select2-container-multi.select2-container .select2-choices { + padding-top: 3px; + padding-bottom: 3px; } -.module-shallow .module-content:first-child { - padding-top: 10px; -} -.module-shallow .module-content:last-child { - padding-bottom: 10px; +.select2-search-choice-close, +.select2-container-multi .select2-search-choice-close { + top: 6px; + left: 5px; } -.module-shallow small { - font-size: 11px; - display: block; +.select2-container-multi .select2-choices { + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; + -moz-transition: border linear 0.2s, box-shadow linear 0.2s; + -o-transition: border linear 0.2s, box-shadow linear 0.2s; + transition: border linear 0.2s, box-shadow linear 0.2s; + background-color: #ffffff; + border: 1px solid #cccccc; } -.module-narrow .module-heading, -.module-narrow .module-content, -.module-narrow .module-footer { - padding-left: 15px; - padding-right: 15px; +.select2-container-active .select2-choices, +.select2-container-multi.select2-container-active .select2-choices { + border-color: rgba(82, 168, 236, 0.8); + outline: 0; + outline: thin dotted \9; + /* IE6-9 */ + + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); } -.module-grid { - margin: 0; - list-style: none; - margin: 0; - list-style: none; - *zoom: 1; - margin-left: -20px; - padding: 0; +.select2-container-multi .select2-drop { + margin-top: -2px; } -.module-grid:before, -.module-grid:after { - display: table; - content: ""; +.select2-container .select2-results li { + line-height: 18px; + padding-top: 4px; + padding-bottom: 4px; } -.module-grid:after { - clear: both; +.control-full .select2-container { + width: 520px !important; } -.module-item { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - width: 33.33%; - padding-left: 20px; - padding-bottom: 25px; - float: left; - float: left; - margin-left: 20px; - width: 460px; - padding-top: 10px; - padding-bottom: 10px; - padding-right: 50px; - overflow: hidden; - position: relative; +.control-group.error .select2-container input:focus, +.control-group.error .select2-container select:focus, +.control-group.error .select2-container textarea:focus { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } -.module-item.first { - clear: left; +.dataset-item { + border-bottom: 1px dotted #dddddd; + padding-bottom: 20px; + margin-bottom: 20px; } -.group .content img { - margin: 0 -5px 5px; - max-width: initial; +.dataset-item:last-of-type { + border-bottom: none; + margin-bottom: 0; + padding-bottom: 0; } -.group .content h3 { - font-size: 14px; +.dataset-heading { + font-size: 16px; + margin-top: 0; + margin-bottom: 8px; line-height: 1.3; } -.group-listing { - margin-left: -20px; +.dataset-heading a { + color: #333333; } -.ckanext-datapreview { +.dataset-heading .label { position: relative; + top: -1px; } -.ckanext-datapreview > iframe { - min-height: 400px; -} -.ckanext-datapreview > img { - max-height: 500px; - max-width: 100%; - overflow: hidden; +.dataset-private { + margin-right: 10px; + text-transform: uppercase; } -.package-info h4 { - margin-bottom: 10px; +.dataset-private .icon-lock { + width: 9px; } -.media { - position: relative; - overflow: hidden; +.dataset-private.pull-right { + margin-right: 0; } -.media-content > :last-child { - margin-bottom: 0; +.dataset-resources { + margin-top: 8px; } -.media-heading { - font-size: 14px; - line-height: 1.3em; - margin: 5px 0; +.dataset-resources li { + display: inline; } -.media-image, -.media .gravatar { - position: relative; - float: left; - margin-right: 10px; - overflow: hidden; +.dataset-resources li a { + background-color: #aaaaaa; } -.media-image:after { - -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3); - -moz-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3); - box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3); - content: ""; - position: absolute; +.dataset-heading .popular { top: 0; - left: 0; - right: 0; - bottom: 0; - z-index: 1; } -.media-image img { - display: block; - margin: 0 auto; -} -.media-vertical .media-image, -.media-vertical .media-content { - float: none; - display: block; -} -.media-vertical .media-image { - margin-right: 0; - max-height: 125px; -} -.media-grid, -ul.media-grid, -ol.media-grid { +.resource-list { margin: 0; list-style: none; - *zoom: 1; - margin-left: -20px; + margin: -10px -10px 10px -10px; } -.media-grid:before, -ul.media-grid:before, -ol.media-grid:before, -.media-grid:after, -ul.media-grid:after, -ol.media-grid:after { - display: table; - content: ""; +.resource-item { + position: relative; + padding: 10px 10px 10px 60px; + margin-bottom: 0px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.media-grid:after, -ul.media-grid:after, -ol.media-grid:after { - clear: both; +.resource-item:hover { + background-color: #eeeeee; } -.media-item { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - width: 33.33%; - padding-left: 20px; - padding-bottom: 25px; - float: left; +.resource-item .heading { + color: #000000; + font-size: 14px; + font-weight: bold; } -.media-item.first { - clear: left; +.resource-item .format-label { + position: absolute; + top: 10px; + left: 10px; } -.media-item .media-content { - min-height: 63px; +.resource-item .description { + font-size: 12px; + margin-bottom: 0; } -.related-item.expanded { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - background-color: #ffffff; - background-color: rgba(255, 255, 255, 0.9); - z-index: 2; +.resource-item .btn-group { + position: absolute; + top: 14px; + right: 10px; } -.media-wide { - padding: 0; +.dataset-resource-form .dataset-form-resource-types { + margin-bottom: 5px; } -.media-wide .media { - float: left; - margin-left: 20px; - width: 460px; +.dataset-form-resource-types .ckan-icon { + position: relative; + top: 3px; } -.media-overlay { +.dataset-form-resource-types .radio { + font-weight: normal; + padding-left: 0; + padding-right: 18px; +} +.dataset-form-resource-types label { position: relative; - min-height: 35px; } -.media-overlay .media-heading { +.dataset-form-resource-types input[type=radio]:checked + label { + font-weight: bold; +} +.dataset-form-resource-types input[type=radio]:checked + label:after { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + width: 16px; + height: 16px; + background-position: -192px 0; + display: block; + content: ""; position: absolute; + top: auto; left: 0; - right: 0; - bottom: 0; - padding: 12px 10px; + bottom: -12px; +} +.dataset-form-resource-types input[type=radio] { + display: none; +} +.tag-list { margin: 0; - background-color: #000; - background-color: rgba(0, 0, 0, 0.8); - font-size: 13px; - color: #fff; - z-index: 1; + list-style: none; + padding: 10px 10px 5px 10px; } -.media-overlay .media-image { - float: none; - display: block; +.tag-list li { + display: inline-block; + margin-right: 5px; +} +.tag-list li:last-child { margin-right: 0; } -.banner { - -webkit-transform: rotate(45deg); - -moz-transform: rotate(45deg); - -ms-transform: rotate(45deg); - -o-transform: rotate(45deg); - transform: rotate(45deg); - -webkit-transform-origin: center center; - -moz-transform-origin: center center; - -ms-transform-origin: center center; - -o-transform-origin: center center; - transform-origin: center center; - position: absolute; - top: 15px; - right: -35px; - width: 80px; - color: #ffffff; - background: #707070; - padding: 1px 20px; - font-size: 11px; - text-align: center; - text-transform: uppercase; +.additional-info td, +.additional-info th { + width: 50%; } -.nav-simple { - *zoom: 1; - margin: 0; - list-style: none; - padding-bottom: 0; +.label[data-format=html], +.label[data-format*=html] { + background-color: #55a1ce; } -.nav-simple:before, -.nav-simple:after { - display: table; - content: ""; +.label[data-format=json], +.label[data-format*=json] { + background-color: #ef7100; } -.nav-simple:after { - clear: both; +.label[data-format=xml], +.label[data-format*=xml] { + background-color: #ef7100; } -.nav-simple > li { - font-size: 12px; - line-height: 1.1666666666666667em; - padding: 7px 25px; - border-bottom: 1px dotted #cccccc; +.label[data-format=text], +.label[data-format*=text] { + background-color: #74cbec; } -.nav-simple > li:last-of-type { - border-bottom: 0; +.label[data-format=csv], +.label[data-format*=csv] { + background-color: #dfb100; } -.nav-simple .ckan-icon { - position: relative; - top: 0px; +.label[data-format=xls], +.label[data-format*=xls] { + background-color: #2db55d; } -.nav-item > a { - color: #333333; - margin: -7px -25px; - padding: 7px 25px; +.label[data-format=zip], +.label[data-format*=zip] { + background-color: #686868; } -.nav-item.active { - background-color: #f2f2f2; +.label[data-format=api], +.label[data-format*=api] { + background-color: #ec96be; } -.nav-item.active > a span { - white-space: nowrap; - overflow: hidden; - display: block; +.label[data-format=pdf], +.label[data-format*=pdf] { + background-color: #e0051e; +} +.label[data-format=rdf], +.label[data-format*=rdf], +.label[data-format*=nquad], +.label[data-format*=ntriples], +.label[data-format*=turtle] { + background-color: #0b4498; } -.nav-item.active > a { - background: url("../../../base/images/background-tag.png") no-repeat -13px center; +.search-form { + margin-bottom: 20px; + padding-bottom: 25px; + border-bottom: 1px dotted #dddddd; +} +.search-form .search-input { position: relative; - display: block; - font-size: 11px; - line-height: 27px; - color: #b509b5; - padding-left: 10px; - padding-right: 5px; - margin-right: 11px; + margin-bottom: 20px; +} +.search-form .search-input input { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; - font-size: 12px; - font-weight: bold; - position: relative; - left: 4px; - margin-left: -25px; - margin-right: -20px; - padding-left: 10px; - padding-right: 0px; - padding: 1px 22px; + margin: 0; + width: 100%; + height: auto; } -.nav-item.active > a:before { - content: ""; - background: url("../../../base/images/background-tag.png") no-repeat center left; - position: absolute; +.search-form .search-input button { + cursor: pointer; display: block; - top: 0; - bottom: 0; - right: -11px; - width: 11px; + position: absolute; + top: 50%; + margin-top: -10px; + right: 10px; + height: 20px; + padding: 0; + border: none; + background: transparent; } -.nav-item [class^=icon] { - font-size: 1.2em; - margin: -1px 0 -1px -1px; +.search-form .search-input button span { + display: none; } -.module-narrow .nav-item > a { - padding-left: 15px; - padding-right: 15px; - position: relative; +.search-form .search-input button i { + color: #cccccc; + -webkit-transition: color 0.2s ease-in; + -moz-transition: color 0.2s ease-in; + -o-transition: color 0.2s ease-in; + transition: color 0.2s ease-in; } -.module-narrow .nav-item.active > a { - padding-left: 12px; - padding-right: 12px; +.search-form .search-input button:hover i { + color: #000000; } -.module-narrow .nav-item.image { - position: relative; +.search-form .search-input.search-giant input { + font-size: 16px; + padding: 15px; } -.module-narrow .nav-item.image > a { - padding-left: 42px; - padding-right: 42px; +.search-form .search-input.search-giant button { + margin-top: -15px; + right: 15px; + height: 30px; } -.module-narrow .nav-item.image > img { - position: absolute; - top: 50%; - left: 15px; - width: 20px; - height: 20px; - margin-top: -10px; - z-index: 2; +.search-form .search-input.search-giant button i { + font-size: 28px; + width: 28px; } -.nav-facet .nav-item > a:hover:after, -.nav-facet .nav-item.active > a:after { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - content: ""; - position: absolute; - top: 50%; - right: 5px; - margin-top: -8px; +.search-form .control-order-by { + float: right; + margin: 0 0 0 15px; } -.nav-facet .nav-item > a:hover:after:last-child, -.nav-facet .nav-item.active > a:after:last-child { - *margin-left: 0; +.search-form .control-order-by label, +.search-form .control-order-by select { + display: inline; } -.nav-facet .nav-item > a:hover:after { - width: 17px; - height: 17px; - background-position: -17px -16px; +.search-form .control-order-by select { + width: 160px; + margin: 0; } -.nav-facet .nav-item.active > a:after { - width: 17px; - height: 17px; - background-position: 0px -16px; - right: 3px; +.search-form h2 { + font-size: 24px; + line-height: 1.3; + color: #000000; + margin-bottom: 0; } -.js .js-hide { - display: none; +.search-form .filter-list { + color: #444444; + line-height: 32px; + margin: 10px 0 0 0; } -.js .js-hide.active { +.search-form .filter-list .pill { + line-height: 21px; +} +.search-form .filter-list .extra { + margin-top: 10px; + font-size: 18px; + font-weight: normal; + color: #000000; +} +.tertiary .control-order-by { + float: none; + margin: 0; +} +.tertiary .control-order-by label { display: block; + margin-bottom: 5px; + font-weight: normal; + font-size: 12px; } -.btn, -label { - font-weight: bold; +.tertiary .control-order-by select { + display: block; + font-size: 12px; + width: 100%; } -label { - cursor: pointer; - font-size: 14px; - line-height: 2; +.tertiary .search-input { + margin-bottom: 10px; } -label:after { - content: ":"; +.group .media-vertical .image { + margin: 0 -5px 5px; } -label.radio:after, -label.checkbox:after { - content: ""; +.group-list:nth-child(odd) { + clear: left; } -input, -textarea, -select, -.uneditable-input { - font-size: 14px; - padding: 8px 10px; +.group-list .module-heading { + padding-top: 15px; + padding-bottom: 15px; } -input[type=radio], -input[type=checkbox] { - position: relative; - top: 7px; - padding: 0; - margin: 0; +.group-list .dataset-content { + min-height: 54px; } -input[type=radio].checkbox-onown, -input[type=checkbox].checkbox-onown { - top: 0; +.group-list .module-heading h3 { + margin-bottom: 2px; } -select { - margin-top: 6px; - padding: 4px; +.group-list .module-heading h3 a { + color: #333333; } -textarea { - max-width: 100%; +.group-list .module-heading .media-image { + overflow: hidden; + max-height: 60px; } -.input-prepend .add-on { - padding: 8px 8px; - font-size: 14px; +.group-list .module-heading .media-image img { + max-width: 85px; } -.control-group .btn { +.toolbar { + *zoom: 1; position: relative; - top: -2px; + margin-bottom: 10px; + padding: 5px 0; } -.control-full input, -.control-full select, -.control-full textarea { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - height: auto; - width: 100%; +.toolbar:before, +.toolbar:after { + display: table; + content: ""; + line-height: 0; } -.control-medium input, -.control-medium select, -.control-medium textarea { - width: 320px; +.toolbar:after { + clear: both; } -.control-large input, -.control-large .control-label { - font-size: 18px; +.page_primary_action { + margin-bottom: 20px; } -.form-actions { - background: none; - margin-left: -25px; - margin-right: -25px; - margin-bottom: 0; - padding-bottom: 0; - text-align: right; -} -.form-actions .action-info { +.toolbar .breadcrumb { + *zoom: 1; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + position: relative; float: left; - width: 50%; - line-height: 2; - text-align: left; - color: #707070; margin: 0; + padding: 0; + border: none; + background: none; + font-size: 20px; + line-height: 1.3; } -.form-actions .action-info.small { - font-size: 11px; - line-height: 1.2; +.toolbar .breadcrumb:before, +.toolbar .breadcrumb:after { + display: table; + content: ""; + line-height: 0; } -.form-horizontal .control-label { - width: 120px; - line-height: 1.3; - padding-top: 9px; +.toolbar .breadcrumb:after { + clear: both; } -.form-horizontal .control-large input, -.form-horizontal .control-large .control-label { - font-size: 18px; - line-height: 2; +.toolbar .breadcrumb li:after { + content: " / "; } -.form-horizontal .control-large .control-label { - padding-top: 10px; +.toolbar .breadcrumb li.active:after { + content: ""; } -.form-horizontal .controls { - margin-left: 130px; +.toolbar .breadcrumb li:last-of-type:after { + content: ""; } -.form-horizontal .info-block { - position: relative; - display: block; - font-size: 11px; - color: #aeaeae; - line-height: 1.3; - padding: 6px 0 6px 25px; - margin-top: 6px; +.toolbar .home a { + text-decoration: none; } -.form-horizontal .info-inline { - float: right; - width: 265px; - margin-top: 0; +.toolbar .home span { + display: none; } -.form-horizontal .control-medium .info-block.info-inline { - width: 165px; +.toolbar .breadcrumb a { + color: #505050; } -.form-horizontal .info-block:before { - font-size: 2.2em; +.toolbar .breadcrumb .active a, +.toolbar .breadcrumb a.active { + font-weight: bold; +} +.actions { + margin: 0; + list-style: none; position: absolute; - left: 0; - top: 2px; + top: 10px; + right: 10px; + z-index: 1; } -.form-horizontal .info-inline:before { - top: 8px; +.actions li { + display: inline-block; + margin-right: 5px; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; } -.info-block .icon-large, -.info-inline .icon-large { +.actions li:last-of-type { + margin-right: 0; +} +.hide-heading { + display: none; +} +.page-header { + *zoom: 1; + border-bottom: 1px solid #dddddd; + background-color: #f6f6f6; + -webkit-border-radius: 0 3px 0 0; + -moz-border-radius: 0 3px 0 0; + border-radius: 0 3px 0 0; +} +.page-header:before, +.page-header:after { + display: table; + content: ""; + line-height: 0; +} +.page-header:after { + clear: both; +} +.page-header .nav-tabs { float: left; - font-size: 22px; - margin-right: 15px; + margin-bottom: -1px; } -.form-horizontal .info-block a { - color: #aeaeae; - text-decoration: underline; +.page-header .nav-tabs li.active a, +.page-header .nav-tabs a:hover { + background-color: #ffffff; } -.form-horizontal .form-actions { - padding-left: 25px; - padding-right: 25px; +.page-header .content_action { + float: right; + margin-top: -5px; + margin-right: -7px; } -.form-inline input { - padding-bottom: 9px; +.no-nav .page-header { + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } -.form-inline select { - margin-top: 0; +h1 { + font-size: 28px; } -.form-inline .btn { - margin-left: 5px; +h2 { + font-size: 21px; } -.form-narrow label { - margin-bottom: 0; +h3 { + font-size: 18px; } -.form-narrow select { - width: 100%; +h4 { + font-size: 14px; } -.form-narrow .form-actions { - margin-left: -15px; - margin-right: -15px; - padding: 10px 15px 0; +h1, +h2, +h3, +h4 { + line-height: 1.5; } -.form-select label { - margin-right: 5px; +h1 small, +h2 small, +h3 small, +h4 small { + font-size: 14px; } -.simple-input label, -.simple-input button { - display: none; +.prose h1, +.prose heading-1 h2, +.prose heading-2 { + margin-bottom: 15px; } -.simple-input .field { - position: relative; +.prose h3, +.prose heading-3 { + margin-bottom: 10px; } -.simple-input .field-bordered { - border-bottom: 1px dotted #cccccc; +.table-chunky td, +.table-chunky th { + padding: 12px 15px; + font-size: 12px; } -.simple-input .field input { - width: 100%; - height: auto; - margin: 0 -7px; - padding: 7px 5px; +.table-chunky thead th, +.table-chunky thead td { + color: #ffffff; + background-color: #aaaaaa; + padding-top: 10px; + padding-bottom: 10px; } -.simple-input .field .btn-search { +.table-striped tbody tr:nth-child(odd) td, +.table-striped tbody tr:nth-child(odd) th { + background-color: transparent; +} +.table-striped tbody tr:nth-child(even) td, +.table-striped tbody tr:nth-child(even) th { + background-color: #f2f2f2; +} +.table-chunky.table-bordered { + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; +} +.table-chunky.table-bordered thead:first-child tr:first-child th:first-child, +.table-chunky.table-bordered tbody:first-child tr:first-child td:first-child { + -webkit-border-top-left-radius: 2px; + -moz-border-radius-topleft: 2px; + border-top-left-radius: 2px; +} +.table-chunky.table-bordered thead:first-child tr:first-child th:last-child, +.table-chunky.table-bordered tbody:first-child tr:first-child td:last-child { + -webkit-border-top-right-radius: 2px; + -moz-border-radius-topright: 2px; + border-top-right-radius: 2px; +} +.table-chunky.table-bordered thead:last-child tr:last-child th:first-child, +.table-chunky.table-bordered tbody:last-child tr:last-child td:first-child { + -webkit-border-radius: 0 0 0 2px; + -moz-border-radius: 0 0 0 2px; + border-radius: 0 0 0 2px; + -webkit-border-bottom-left-radius: 2px; + -moz-border-radius-bottomleft: 2px; + border-bottom-left-radius: 2px; +} +.table-chunky.table-bordered thead:last-child tr:last-child th:last-child, +.table-chunky.table-bordered tbody:last-child tr:last-child td:last-child { + -webkit-border-bottom-right-radius: 2px; + -moz-border-radius-bottomright: 2px; + border-bottom-right-radius: 2px; +} +.ellipsis { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.ckan-icon { *margin-right: .3em; display: inline-block; vertical-align: text-bottom; @@ -5209,1524 +6647,1336 @@ textarea { background-image: url("../../../base/images/sprite-ckan-icons.png"); background-repeat: no-repeat; background-position: 16px 16px; - width: 17px; - height: 17px; - background-position: -51px -16px; - position: absolute; - display: block; - height: 17px; - width: 17px; - top: 50%; - right: 0; - margin-top: -8px; - background-color: transparent; - border: none; - text-indent: -999em; } -.simple-input .field .btn-search:last-child { - *margin-left: 0; +.ckan-icon-fb { + width: 16px; + height: 16px; + background-position: 0px 0; } -.editor textarea { - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - border-bottom: none; +.ckan-icon-gplus { + width: 16px; + height: 16px; + background-position: -16px 0; } -.editor .editor-info-block { - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - display: block; - float: none; - padding: 4px 10px; - background: #ebebeb; +.ckan-icon-twitter { + width: 16px; + height: 16px; + background-position: -32px 0; +} +.ckan-icon-email { + width: 16px; + height: 16px; + background-position: -48px 0; +} +.ckan-icon-share { + width: 16px; + height: 16px; + background-position: -64px 0; +} +.ckan-icon-feed { + width: 16px; + height: 16px; + background-position: -80px 0; +} +.ckan-icon-calendar { + width: 16px; + height: 16px; + background-position: -96px 0; +} +.ckan-icon-file { + width: 16px; + height: 16px; + background-position: -112px 0; +} +.ckan-icon-lock { + width: 16px; + height: 16px; + background-position: -128px 0; +} +.ckan-icon-link-file { + width: 16px; + height: 16px; + background-position: -144px 0; +} +.ckan-icon-link-plugin { + width: 16px; + height: 16px; + background-position: -160px 0; +} +.ckan-icon-upload-file { + width: 16px; + height: 16px; + background-position: -176px 0; +} +.ckan-icon-callout { + width: 16px; + height: 16px; + background-position: -192px 0; +} +.ckan-icon-circle-cross { + width: 17px; + height: 17px; + background-position: 0px -16px; +} +.ckan-icon-circle-add { + width: 17px; + height: 17px; + background-position: -17px -16px; +} +.ckan-icon-flame { + width: 17px; + height: 17px; + background-position: -34px -16px; +} +.ckan-icon-search { + width: 17px; + height: 17px; + background-position: -51px -16px; +} +.ckan-icon-large-lock { + width: 20px; + height: 20px; + background-position: 0px -33px; +} +.ckan-icon-photo { + width: 20px; + height: 20px; + background-position: -20px -33px; +} +.ckan-icon-add { + width: 20px; + height: 20px; + background-position: -40px -33px; +} +.ckan-icon-home { + width: 20px; + height: 20px; + background-position: -60px -33px; +} +.ckan-icon-rewind { + width: 20px; + height: 20px; + background-position: -80px -33px; +} +.ckan-icon-tools { + width: 20px; + height: 20px; + background-position: -100px -33px; +} +.ckan-icon-flag { + width: 20px; + height: 20px; + background-position: -120px -33px; +} +.ckan-icon-clipboard { + width: 20px; + height: 20px; + background-position: -140px -33px; +} +.ckan-icon-share { + width: 20px; + height: 20px; + background-position: -160px -33px; +} +.ckan-icon-info { + width: 20px; + height: 20px; + background-position: -180px -33px; +} +.ckan-icon-download { + width: 20px; + height: 20px; + background-position: -200px -33px; +} +.ckan-icon-star { + width: 20px; + height: 20px; + background-position: -220px -33px; +} +.ckan-icon-info-flat { + width: 20px; + height: 20px; + background-position: -240px -33px; +} +.ckan-icon-tag { + width: 20px; + height: 20px; + background-position: -260px -33px; +} +.ckan-icon-plus { + width: 20px; + height: 20px; + background-position: -280px -33px; + width: 16px; +} +.ckan-icon-head { + width: 20px; + height: 20px; + background-position: -300px -33px; +} +.ckan-icon-arrow-e { + width: 20px; + height: 20px; + background-position: -320px -33px; + width: 16px; +} +.ckan-icon-bookmark { + width: 25px; + height: 25px; + background-position: 0px -53px; +} +.format-label { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + text-indent: -900em; + background: url("../../../base/images/sprite-resource-icons.png") no-repeat 0 0; +} +.format-label { + width: 32px; + height: 35px; + background-position: 0px -62px; +} +.format-label[data-format=rdf], +.format-label[data-format*=rdf] { + width: 32px; + height: 35px; + background-position: -32px -62px; +} +.format-label[data-format=pdf], +.format-label[data-format*=pdf] { + width: 32px; + height: 35px; + background-position: -64px -62px; +} +.format-label[data-format=api], +.format-label[data-format*=api] { + width: 32px; + height: 35px; + background-position: -96px -62px; +} +.format-label[data-format=zip], +.format-label[data-format*=zip] { + width: 32px; + height: 35px; + background-position: -128px -62px; +} +.format-label[data-format=xls], +.format-label[data-format*=xls] { + width: 32px; + height: 35px; + background-position: -160px -62px; +} +.format-label[data-format=csv], +.format-label[data-format*=csv] { + width: 32px; + height: 35px; + background-position: -192px -62px; +} +.format-label[data-format=txt], +.format-label[data-format*=txt] { + width: 32px; + height: 35px; + background-position: -224px -62px; +} +.format-label[data-format=xml], +.format-label[data-format*=xml] { + width: 32px; + height: 35px; + background-position: -256px -62px; +} +.format-label[data-format=json], +.format-label[data-format*=json] { + width: 32px; + height: 35px; + background-position: -288px -62px; +} +.format-label[data-format=html], +.format-label[data-format*=html] { + width: 32px; + height: 35px; + background-position: -320px -62px; +} +/* This is a modified version of the font-awesome core less document. */ +@font-face { + font-family: 'FontAwesome'; + src: url('../../../base/vendor/font-awesome/font/fontawesome-webfont.eot?v=3.0.1'); + src: url('../../../base/vendor/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.0.1') format('embedded-opentype'), url('../../../base/vendor/font-awesome/font/fontawesome-webfont.woff?v=3.0.1') format('woff'), url('../../../base/vendor/font-awesome/font/fontawesome-webfont.ttf?v=3.0.1') format('truetype'); + font-weight: normal; + font-style: normal; +} +[class^="icon-"], +[class*=" icon-"] { + font-family: FontAwesome; + font-weight: normal; + font-style: normal; + text-decoration: inherit; + -webkit-font-smoothing: antialiased; + display: inline; width: auto; - border: 1px solid #cccccc; - border-top: none; - font-size: 11px; - color: #282828; + height: auto; + line-height: normal; + vertical-align: baseline; + background-image: none; + background-position: 0% 0%; + background-repeat: repeat; + margin-top: 0; } -.editor .editor-info-block a { - color: #b509b5; - text-decoration: none; +.icon-spin { + display: inline-block; + -moz-animation: spin 2s infinite linear; + -o-animation: spin 2s infinite linear; + -webkit-animation: spin 2s infinite linear; + animation: spin 2s infinite linear; +} +@-moz-keyframes spin { + 0% { + -moz-transform: rotate(0deg); + } + 100% { + -moz-transform: rotate(359deg); + } } -.control-custom { - font-size: 0; +@-webkit-keyframes spin { + 0% { + -webkit-transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + } } -.control-custom label { - margin-bottom: 0; +@-o-keyframes spin { + 0% { + -o-transform: rotate(0deg); + } + 100% { + -o-transform: rotate(359deg); + } } -.control-custom input { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - width: 140px; +@-ms-keyframes spin { + 0% { + -ms-transform: rotate(0deg); + } + 100% { + -ms-transform: rotate(359deg); + } } -.control-custom input:last-of-type { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; +@keyframes spin { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(359deg); + } } -.control-custom .checkbox { - display: inline-block; - margin-left: 5px; +@-moz-document url-prefix() { + .icon-spin { + height: .9em; + } + .btn .icon-spin { + height: auto; + } + .icon-spin.icon-large { + height: 1.25em; + } + .btn .icon-spin.icon-large { + height: .75em; + } } -.control-custom .checkbox input { - width: auto; +/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen + readers do not read off random characters that represent icons */ +.icon-glass:before { + content: "\f000"; } -.control-custom.disabled label, -.control-custom.disabled input { - color: #aaaaaa; - text-decoration: line-through; - text-shadow: none; +.icon-music:before { + content: "\f001"; } -.control-custom.disabled input { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - background-color: #f3f3f3; +.icon-search:before { + content: "\f002"; } -.control-custom.disabled .checkbox { - color: #4d4d4d; - text-decoration: none; +.icon-envelope:before { + content: "\f003"; } -.control-custom .checkbox.btn { - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; - position: relative; - top: 0; - left: 5px; - height: 3px; - width: 8px; - padding: 3px 8px; +.icon-heart:before { + content: "\f004"; } -.control-custom .checkbox.btn span { - display: none; - width: 30px; +.icon-star:before { + content: "\f005"; } -.control-custom .checkbox.btn:before { - position: relative; - top: 1px; - left: -1px; - color: #fff; +.icon-star-empty:before { + content: "\f006"; } -.control-custom .checkbox.btn input { - display: none; +.icon-user:before { + content: "\f007"; } -.control-custom.disabled .checkbox.btn { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #f654f6; - background-image: -moz-linear-gradient(top, #f544f5, #f76bf7); - background-image: -ms-linear-gradient(top, #f544f5, #f76bf7); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f544f5), to(#f76bf7)); - background-image: -webkit-linear-gradient(top, #f544f5, #f76bf7); - background-image: -o-linear-gradient(top, #f544f5, #f76bf7); - background-image: linear-gradient(top, #f544f5, #f76bf7); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f544f5', endColorstr='#f76bf7', GradientType=0); - border-color: #f76bf7 #f76bf7 #f322f3; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #f76bf7; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-film:before { + content: "\f008"; } -.control-custom.disabled .checkbox.btn:hover, -.control-custom.disabled .checkbox.btn:active, -.control-custom.disabled .checkbox.btn.active, -.control-custom.disabled .checkbox.btn.disabled, -.control-custom.disabled .checkbox.btn[disabled] { - background-color: #f76bf7; - *background-color: #f653f6; +.icon-th-large:before { + content: "\f009"; } -.control-custom.disabled .checkbox.btn:active, -.control-custom.disabled .checkbox.btn.active { - background-color: #f43bf4 \9; +.icon-th:before { + content: "\f00a"; } -.control-custom.disabled .checkbox.btn .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-th-list:before { + content: "\f00b"; } -.alert-danger a, -.alert-error a { - color: #b55457; +.icon-ok:before { + content: "\f00c"; } -.control-group.error input, -.control-group.error select, -.control-group.error textarea, -.control-group.error .input-prepend .add-on, -.control-group.error .input-append .add-on { - border-color: #c6898b; +.icon-remove:before { + content: "\f00d"; } -.error-inline { - color: #b55457; +.icon-zoom-in:before { + content: "\f00e"; } -.error-block, -.error-inline { - font-size: 12px; +.icon-zoom-out:before { + content: "\f010"; } -.error-block { - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - display: block; - padding: 6px 8px 3px; - background: #c6898b; - margin: -3px 0 0; - color: #ffffff; - width: 216px; +.icon-off:before { + content: "\f011"; } -.control-medium .error-block { - width: 326px; +.icon-signal:before { + content: "\f012"; } -.control-full .error-block { - width: auto; +.icon-cog:before { + content: "\f013"; } -.control-group.error .input-prepend .error-block, -.control-custom.error .error-block { - margin-left: -1px; - width: auto; +.icon-trash:before { + content: "\f014"; } -.control-custom.error .error-block { - width: 409px; +.icon-home:before { + content: "\f015"; } -.control-select.error .error-block { - width: 204px; +.icon-file:before { + content: "\f016"; } -.stages { - margin: 0; - list-style: none; - *zoom: 1; - color: #aeaeae; - counter-reset: stage; - margin: -20px -25px 20px; - overflow: hidden; +.icon-time:before { + content: "\f017"; } -.stages:before, -.stages:after { - display: table; - content: ""; +.icon-road:before { + content: "\f018"; } -.stages:after { - clear: both; +.icon-download-alt:before { + content: "\f019"; } -.stages li { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - line-height: 27px; - counter-increment: stage; - width: 33.33%; - background-color: #ededed; - float: left; - padding: 10px 20px; - position: relative; - z-index: 0; +.icon-download:before { + content: "\f01a"; } -.stages li:before { - -webkit-border-radius: 14px; - -moz-border-radius: 14px; - border-radius: 14px; - content: counter(stage); - display: inline-block; - width: 27px; - height: 27px; - margin-right: 5px; - font-weight: bold; - text-align: center; - color: #ffffff; - background-color: #aeaeae; - z-index: 1; +.icon-upload:before { + content: "\f01b"; +} +.icon-inbox:before { + content: "\f01c"; +} +.icon-play-circle:before { + content: "\f01d"; +} +.icon-repeat:before { + content: "\f01e"; +} +/* \f020 doesn't work in Safari. all shifted one down */ +.icon-refresh:before { + content: "\f021"; +} +.icon-list-alt:before { + content: "\f022"; +} +.icon-lock:before { + content: "\f023"; +} +.icon-flag:before { + content: "\f024"; +} +.icon-headphones:before { + content: "\f025"; +} +.icon-volume-off:before { + content: "\f026"; +} +.icon-volume-down:before { + content: "\f027"; +} +.icon-volume-up:before { + content: "\f028"; +} +.icon-qrcode:before { + content: "\f029"; +} +.icon-barcode:before { + content: "\f02a"; } -.stages li:after { - left: 0; - border: solid rgba(237, 237, 237, 0); - content: " "; - height: 0; - width: 0; - position: absolute; - pointer-events: none; - border-top-color: #ededed; - border-bottom-color: #ededed; - border-width: 29px; - top: 50%; - margin-top: -29px; - margin-left: -30px; +.icon-tag:before { + content: "\f02b"; } -.stages li.first, -.stages li.first .highlight { - -webkit-border-radius: 3px 0 0 0; - -moz-border-radius: 3px 0 0 0; - border-radius: 3px 0 0 0; +.icon-tags:before { + content: "\f02c"; } -.stages li.last { - position: relative; - right: -1px; +.icon-book:before { + content: "\f02d"; } -.stages li.last, -.stages li.last .highlight { - -webkit-border-radius: 0 3px 0 0; - -moz-border-radius: 0 3px 0 0; - border-radius: 0 3px 0 0; +.icon-bookmark:before { + content: "\f02e"; } -.stages li.first:after { - content: none; - border: none; +.icon-print:before { + content: "\f02f"; } -.stages li.active:after { - border-color: rgba(140, 198, 138, 0); - border-top-color: #8cc68a; - border-bottom-color: #8cc68a; +.icon-camera:before { + content: "\f030"; } -.stages li.complete:after { - border-color: rgba(197, 226, 196, 0); - border-top-color: #c5e2c4; - border-bottom-color: #c5e2c4; +.icon-font:before { + content: "\f031"; } -.stages.stage-3 li.complete:first-child:after { - content: none; +.icon-bold:before { + content: "\f032"; } -.stages li.active, -.stages li.complete { - background: none; +.icon-italic:before { + content: "\f033"; } -.stages li.active:before { - color: #8cc68a; - background: #ffffff; +.icon-text-height:before { + content: "\f034"; } -.stages li.complete:before { - color: #c5e2c4; - background: #eef6ed; +.icon-text-width:before { + content: "\f035"; } -.stages li .highlight { - display: block; - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - width: 100%; - padding: 10px 52px; - border: none; - text-align: left; - text-decoration: none; - line-height: 27px; - z-index: -1; +.icon-align-left:before { + content: "\f036"; } -.stages li.active .highlight { - color: #ffffff; - background: #8cc68a; +.icon-align-center:before { + content: "\f037"; } -.stages li.complete .highlight { - color: #eef6ed; - background: #c5e2c4; +.icon-align-right:before { + content: "\f038"; } -.alert > :last-child { - margin-bottom: 0; +.icon-align-justify:before { + content: "\f039"; } -.slug-preview { - font-size: 14px; - line-height: 1.5; - margin-top: 5px; - margin-left: 10px; +.icon-list:before { + content: "\f03a"; } -.slug-preview-value { - background-color: #faedcf; - margin-right: 3px; +.icon-indent-left:before { + content: "\f03b"; } -.slug-preview .btn { - padding-top: 3px; - padding-bottom: 3px; +.icon-indent-right:before { + content: "\f03c"; } -.resource-upload-field { - position: relative; - overflow: hidden; - display: inline-block; - vertical-align: bottom; +.icon-facetime-video:before { + content: "\f03d"; } -.resource-upload-field label { - z-index: 0; +.icon-picture:before { + content: "\f03e"; } -.resource-upload-field input { - opacity: 0; - filter: alpha(opacity=0); - position: absolute; - top: 0; - right: 0; - z-index: 1; - margin: 0; - border: solid transparent; - border-width: 100px 0 0 200px; - cursor: pointer; - direction: ltr; - -moz-transform: translate(-300px, 0) scale(4); +.icon-pencil:before { + content: "\f040"; } -.resource-upload-field.loading { - display: inline-block; - background: url("../../../base/images/loading-spinner.gif") no-repeat center right; - padding-right: 5px; +.icon-map-marker:before { + content: "\f041"; } -.select2-container .select2-choice input, -.select2-container-multi .select2-choices .select2-search-field:first-child input { - font-size: 14px; +.icon-adjust:before { + content: "\f042"; } -.select2-container-multi .select2-choices .select2-search-field input { - height: 29px; +.icon-tint:before { + content: "\f043"; } -.select2-container .select2-choice input, -.select2-container-multi .select2-choices .select2-search-field:first-child input { - padding-left: 10px; +.icon-edit:before { + content: "\f044"; } -.select2-container { - margin-top: 5px; +.icon-share:before { + content: "\f045"; } -.select2-container-multi { - margin-top: 0; +.icon-check:before { + content: "\f046"; } -.select2-container-multi .select2-choices .select2-search-choice { - padding: 5px 8px 5px 22px; +.icon-move:before { + content: "\f047"; } -.select2-container-multi.select2-container .select2-choices { - padding-top: 3px; - padding-bottom: 3px; +.icon-step-backward:before { + content: "\f048"; } -.select2-search-choice-close, -.select2-container-multi .select2-search-choice-close { - top: 6px; - left: 5px; +.icon-fast-backward:before { + content: "\f049"; } -.select2-container-multi .select2-choices { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; - background-color: #ffffff; - border: 1px solid #cccccc; +.icon-backward:before { + content: "\f04a"; } -.select2-container-active .select2-choices, -.select2-container-multi.select2-container-active .select2-choices { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); +.icon-play:before { + content: "\f04b"; } -.select2-container-multi .select2-drop { - margin-top: -2px; +.icon-pause:before { + content: "\f04c"; } -.select2-container .select2-results li { - line-height: 18px; - padding-top: 4px; - padding-bottom: 4px; +.icon-stop:before { + content: "\f04d"; } -.control-full .select2-container { - width: 520px !important; +.icon-forward:before { + content: "\f04e"; } -.dataset-item { - border-bottom: 1px dotted #cccccc; - padding-bottom: 20px; - margin-bottom: 20px; +.icon-fast-forward:before { + content: "\f050"; } -.dataset-item:last-of-type { - border-bottom: none; - margin-bottom: 0; - padding-bottom: 0; +.icon-step-forward:before { + content: "\f051"; } -.dataset-heading { - font-size: 14px; - line-height: 1.3; +.icon-eject:before { + content: "\f052"; } -.dataset-heading a { - color: #333333; +.icon-chevron-left:before { + content: "\f053"; +} +.icon-chevron-right:before { + content: "\f054"; +} +.icon-plus-sign:before { + content: "\f055"; +} +.icon-minus-sign:before { + content: "\f056"; +} +.icon-remove-sign:before { + content: "\f057"; } -.dataset-heading .label { - position: relative; - top: -1px; +.icon-ok-sign:before { + content: "\f058"; } -.dataset-content { - font-size: 12px; +.icon-question-sign:before { + content: "\f059"; } -.dataset-resources { - font-size: 10px; - line-height: 14px; - margin-top: 5px; +.icon-info-sign:before { + content: "\f05a"; } -.dataset-resources li { - display: inline; +.icon-screenshot:before { + content: "\f05b"; } -.dataset-resources li a { - background-color: #aaaaaa; +.icon-remove-circle:before { + content: "\f05c"; } -.dataset-heading .popular { - top: 0; +.icon-ok-circle:before { + content: "\f05d"; } -.results { - margin-bottom: 20px; - padding-bottom: 25px; - border-bottom: 1px dotted #cccccc; +.icon-ban-circle:before { + content: "\f05e"; } -.results strong { - display: block; - font-size: 24px; - line-height: 1.3; - color: #000000; - margin-bottom: 10px; +.icon-arrow-left:before { + content: "\f060"; } -.results strong:before { - float: right; - content: " "; - width: 280px; - white-space: pre; +.icon-arrow-right:before { + content: "\f061"; } -.filter-list { - color: #4d4d4d; - font-weight: bold; +.icon-arrow-up:before { + content: "\f062"; } -.filter-list .extra { - margin-top: 10px; - font-size: 18px; - font-weight: normal; - color: #000000; +.icon-arrow-down:before { + content: "\f063"; } -.dataset-search { - position: relative; +.icon-share-alt:before { + content: "\f064"; } -.search-giant { - position: relative; +.icon-resize-full:before { + content: "\f065"; } -.search-giant input { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - font-size: 16px; - padding: 14px 10px; - width: 100%; - height: auto; +.icon-resize-small:before { + content: "\f066"; } -.search-giant button { - cursor: pointer; - position: absolute; - right: 15px; - top: 50%; - display: block; - border: none; - padding: 0; - margin-top: -17px; - width: 30px; - height: 30px; - background: transparent url("../../../base/images/icon-search-27x26.png") no-repeat center center; - text-indent: -900em; +.icon-plus:before { + content: "\f067"; } -.control-order-by { - position: absolute; - bottom: -65px; - right: 0; +.icon-minus:before { + content: "\f068"; } -.control-order-by label, -.control-order-by select { - display: inline; +.icon-asterisk:before { + content: "\f069"; } -.control-order-by select { - width: 160px; +.icon-exclamation-sign:before { + content: "\f06a"; } -.resource-list { - margin: 0; - list-style: none; - margin: -10px -10px 10px -10px; +.icon-gift:before { + content: "\f06b"; } -.resource-item { - position: relative; - padding: 10px 110px 10px 60px; - margin-bottom: 0px; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; +.icon-leaf:before { + content: "\f06c"; } -.resource-item:hover { - background-color: #efefef; +.icon-fire:before { + content: "\f06d"; } -.resource-item .heading { - color: #000000; - font-size: 14px; - font-weight: bold; +.icon-eye-open:before { + content: "\f06e"; } -.resource-item .format-label { - position: absolute; - top: 10px; - left: 10px; +.icon-eye-close:before { + content: "\f070"; } -.resource-item .description { - font-size: 12px; - margin-bottom: 0; +.icon-warning-sign:before { + content: "\f071"; } -.resource-item .btn-group { - position: absolute; - top: 13px; - right: 10px; +.icon-plane:before { + content: "\f072"; } -.dataset-resource-form .dataset-form-resource-types { - margin-bottom: 5px; +.icon-calendar:before { + content: "\f073"; } -.dataset-form-resource-types .ckan-icon { - position: relative; - top: 3px; +.icon-random:before { + content: "\f074"; } -.dataset-form-resource-types .radio { - font-weight: normal; - padding-left: 0; - padding-right: 18px; +.icon-comment:before { + content: "\f075"; } -.dataset-form-resource-types label { - position: relative; +.icon-magnet:before { + content: "\f076"; } -.dataset-form-resource-types input[type=radio]:checked + label { - font-weight: bold; +.icon-chevron-up:before { + content: "\f077"; } -.dataset-form-resource-types input[type=radio]:checked + label:after { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - width: 16px; - height: 16px; - background-position: -192px 0; - display: block; - content: ""; - position: absolute; - top: auto; - left: 0; - bottom: -12px; +.icon-chevron-down:before { + content: "\f078"; } -.dataset-form-resource-types input[type=radio]:checked + label:after:last-child { - *margin-left: 0; +.icon-retweet:before { + content: "\f079"; } -.dataset-form-resource-types input[type=radio] { - display: none; +.icon-shopping-cart:before { + content: "\f07a"; } -.tag-list { - margin: 0; - list-style: none; - padding: 10px; +.icon-folder-close:before { + content: "\f07b"; } -.tag-list li { - display: inline-block; - margin-right: 5px; +.icon-folder-open:before { + content: "\f07c"; } -.tag-list li:last-child { - margin-right: 0; +.icon-resize-vertical:before { + content: "\f07d"; } -.additional-info td, -.additional-info th { - width: 50%; +.icon-resize-horizontal:before { + content: "\f07e"; } -.label[data-format=html], -.label[data-format*=html] { - background-color: #55a1ce; +.icon-bar-chart:before { + content: "\f080"; } -.label[data-format=json], -.label[data-format*=json] { - background-color: #ef7100; +.icon-twitter-sign:before { + content: "\f081"; } -.label[data-format=xml], -.label[data-format*=xml] { - background-color: #ef7100; +.icon-facebook-sign:before { + content: "\f082"; } -.label[data-format=text], -.label[data-format*=text] { - background-color: #74cbec; +.icon-camera-retro:before { + content: "\f083"; } -.label[data-format=csv], -.label[data-format*=csv] { - background-color: #dfb100; +.icon-key:before { + content: "\f084"; } -.label[data-format=xls], -.label[data-format*=xls] { - background-color: #2db55d; +.icon-cogs:before { + content: "\f085"; } -.label[data-format=zip], -.label[data-format*=zip] { - background-color: #686868; +.icon-comments:before { + content: "\f086"; } -.label[data-format=api], -.label[data-format*=api] { - background-color: #ec96be; +.icon-thumbs-up:before { + content: "\f087"; } -.label[data-format=pdf], -.label[data-format*=pdf] { - background-color: #e0051e; +.icon-thumbs-down:before { + content: "\f088"; } -.label[data-format=rdf], -.label[data-format*=rdf], -.label[data-format*=nquad], -.label[data-format*=ntriples], -.label[data-format*=turtle] { - background-color: #0b4498; +.icon-star-half:before { + content: "\f089"; } -.group .media-vertical .image { - margin: 0 -5px 5px; +.icon-heart-empty:before { + content: "\f08a"; } -.group-list:nth-child(odd) { - clear: left; +.icon-signout:before { + content: "\f08b"; } -.group-list .module-heading { - padding-top: 15px; - padding-bottom: 15px; +.icon-linkedin-sign:before { + content: "\f08c"; } -.group-list .dataset-content { - min-height: 54px; +.icon-pushpin:before { + content: "\f08d"; } -.group-list .module-heading h3 { - margin-bottom: 2px; +.icon-external-link:before { + content: "\f08e"; } -.group-list .module-heading h3 a { - color: #333333; +.icon-signin:before { + content: "\f090"; } -.toolbar { - *zoom: 1; - margin-top: -10px; - margin-bottom: 10px; - padding: 5px 0; +.icon-trophy:before { + content: "\f091"; } -.toolbar:before, -.toolbar:after { - display: table; - content: ""; +.icon-github-sign:before { + content: "\f092"; } -.toolbar:after { - clear: both; +.icon-upload-alt:before { + content: "\f093"; } -.toolbar .breadcrumb { - *zoom: 1; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - position: relative; - float: left; - margin: 0; - padding: 0; - border: none; - background: none; - font-size: 20px; +.icon-lemon:before { + content: "\f094"; } -.toolbar .breadcrumb:before, -.toolbar .breadcrumb:after { - display: table; - content: ""; +.icon-phone:before { + content: "\f095"; } -.toolbar .breadcrumb:after { - clear: both; +.icon-check-empty:before { + content: "\f096"; } -.toolbar li [class^=icon]:before { - width: auto; +.icon-bookmark-empty:before { + content: "\f097"; } -.toolbar .breadcrumb li:after { - content: " / "; +.icon-phone-sign:before { + content: "\f098"; } -.toolbar .breadcrumb li.active:after { - content: ""; +.icon-twitter:before { + content: "\f099"; } -.toolbar .breadcrumb li:last-of-type:after { - content: ""; +.icon-facebook:before { + content: "\f09a"; } -.toolbar .home a { - text-decoration: none; +.icon-github:before { + content: "\f09b"; } -.toolbar .home span { - display: none; +.icon-unlock:before { + content: "\f09c"; } -.toolbar .breadcrumb a { - color: #505050; - line-height: 28px; +.icon-credit-card:before { + content: "\f09d"; } -.toolbar .breadcrumb .active a { - font-weight: bold; +.icon-rss:before { + content: "\f09e"; } -.toolbar .actions { - margin: 0; - list-style: none; +.icon-hdd:before { + content: "\f0a0"; } -.toolbar .actions li { - display: inline-block; - margin-right: 5px; +.icon-bullhorn:before { + content: "\f0a1"; } -.toolbar .actions li { - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; +.icon-bell:before { + content: "\f0a2"; } -.toolbar .actions li:last-of-type { - margin-right: 0; +.icon-certificate:before { + content: "\f0a3"; } -.toolbar .btn { - padding: 0 10px 0 8px; - border-color: #b7b7b7; - line-height: 27px; +.icon-hand-right:before { + content: "\f0a4"; } -.toolbar .btn-success { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(top, #62c462, #51a351); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); - border-color: #51a351 #51a351 #387038; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #51a351; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-hand-left:before { + content: "\f0a5"; } -.toolbar .btn-success:hover, -.toolbar .btn-success:active, -.toolbar .btn-success.active, -.toolbar .btn-success.disabled, -.toolbar .btn-success[disabled] { - background-color: #51a351; - *background-color: #499249; +.icon-hand-up:before { + content: "\f0a6"; } -.toolbar .btn-success:active, -.toolbar .btn-success.active { - background-color: #408140 \9; +.icon-hand-down:before { + content: "\f0a7"; } -.toolbar .btn-success .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-circle-arrow-left:before { + content: "\f0a8"; } -.toolbar .btn-primary { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #f654f6; - background-image: -moz-linear-gradient(top, #f544f5, #f76bf7); - background-image: -ms-linear-gradient(top, #f544f5, #f76bf7); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f544f5), to(#f76bf7)); - background-image: -webkit-linear-gradient(top, #f544f5, #f76bf7); - background-image: -o-linear-gradient(top, #f544f5, #f76bf7); - background-image: linear-gradient(top, #f544f5, #f76bf7); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f544f5', endColorstr='#f76bf7', GradientType=0); - border-color: #f76bf7 #f76bf7 #f322f3; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #f76bf7; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-circle-arrow-right:before { + content: "\f0a9"; } -.toolbar .btn-primary:hover, -.toolbar .btn-primary:active, -.toolbar .btn-primary.active, -.toolbar .btn-primary.disabled, -.toolbar .btn-primary[disabled] { - background-color: #f76bf7; - *background-color: #f653f6; +.icon-circle-arrow-up:before { + content: "\f0aa"; } -.toolbar .btn-primary:active, -.toolbar .btn-primary.active { - background-color: #f43bf4 \9; +.icon-circle-arrow-down:before { + content: "\f0ab"; } -.toolbar .btn-primary .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-globe:before { + content: "\f0ac"; } -.toolbar .btn-warning { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #faa732; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(top, #fbb450, #f89406); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); - border-color: #f89406 #f89406 #ad6704; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #f89406; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-wrench:before { + content: "\f0ad"; } -.toolbar .btn-warning:hover, -.toolbar .btn-warning:active, -.toolbar .btn-warning.active, -.toolbar .btn-warning.disabled, -.toolbar .btn-warning[disabled] { - background-color: #f89406; - *background-color: #df8505; +.icon-tasks:before { + content: "\f0ae"; } -.toolbar .btn-warning:active, -.toolbar .btn-warning.active { - background-color: #c67605 \9; +.icon-filter:before { + content: "\f0b0"; } -.toolbar .btn-warning .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-briefcase:before { + content: "\f0b1"; } -.toolbar .btn-danger { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #da4f49; - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(top, #ee5f5b, #bd362f); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); - border-color: #bd362f #bd362f #802420; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #bd362f; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-fullscreen:before { + content: "\f0b2"; } -.toolbar .btn-danger:hover, -.toolbar .btn-danger:active, -.toolbar .btn-danger.active, -.toolbar .btn-danger.disabled, -.toolbar .btn-danger[disabled] { - background-color: #bd362f; - *background-color: #a9302a; +.icon-group:before { + content: "\f0c0"; } -.toolbar .btn-danger:active, -.toolbar .btn-danger.active { - background-color: #942a25 \9; +.icon-link:before { + content: "\f0c1"; } -.toolbar .btn-danger .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-cloud:before { + content: "\f0c2"; } -.toolbar .btn-success { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(top, #62c462, #51a351); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); - border-color: #51a351 #51a351 #387038; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #51a351; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-beaker:before { + content: "\f0c3"; } -.toolbar .btn-success:hover, -.toolbar .btn-success:active, -.toolbar .btn-success.active, -.toolbar .btn-success.disabled, -.toolbar .btn-success[disabled] { - background-color: #51a351; - *background-color: #499249; +.icon-cut:before { + content: "\f0c4"; } -.toolbar .btn-success:active, -.toolbar .btn-success.active { - background-color: #408140 \9; +.icon-copy:before { + content: "\f0c5"; } -.toolbar .btn-success .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-paper-clip:before { + content: "\f0c6"; } -.toolbar .btn-info { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #49afcd; - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); - background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(top, #5bc0de, #2f96b4); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); - border-color: #2f96b4 #2f96b4 #1f6377; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #2f96b4; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-save:before { + content: "\f0c7"; +} +.icon-sign-blank:before { + content: "\f0c8"; } -.toolbar .btn-info:hover, -.toolbar .btn-info:active, -.toolbar .btn-info.active, -.toolbar .btn-info.disabled, -.toolbar .btn-info[disabled] { - background-color: #2f96b4; - *background-color: #2a85a0; +.icon-reorder:before { + content: "\f0c9"; } -.toolbar .btn-info:active, -.toolbar .btn-info.active { - background-color: #24748c \9; +.icon-list-ul:before { + content: "\f0ca"; } -.toolbar .btn-info .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-list-ol:before { + content: "\f0cb"; } -.toolbar .btn-inverse { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #414141; - background-image: -moz-linear-gradient(top, #555555, #222222); - background-image: -ms-linear-gradient(top, #555555, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); - background-image: -webkit-linear-gradient(top, #555555, #222222); - background-image: -o-linear-gradient(top, #555555, #222222); - background-image: linear-gradient(top, #555555, #222222); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); - border-color: #222222 #222222 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #222222; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-strikethrough:before { + content: "\f0cc"; } -.toolbar .btn-inverse:hover, -.toolbar .btn-inverse:active, -.toolbar .btn-inverse.active, -.toolbar .btn-inverse.disabled, -.toolbar .btn-inverse[disabled] { - background-color: #222222; - *background-color: #151515; +.icon-underline:before { + content: "\f0cd"; } -.toolbar .btn-inverse:active, -.toolbar .btn-inverse.active { - background-color: #080808 \9; +.icon-table:before { + content: "\f0ce"; } -.toolbar .btn-inverse .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-magic:before { + content: "\f0d0"; } -.hide-heading { - display: none; +.icon-truck:before { + content: "\f0d1"; } -.page-header { - position: relative; - border-bottom: 1px solid #d0d0d0; - height: 30px; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - background-color: #f3f3f3; - background-image: -moz-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -ms-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f0f0f0)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -o-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: linear-gradient(top, #f5f5f5, #f0f0f0); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f0f0f0', GradientType=0); +.icon-pinterest:before { + content: "\f0d2"; } -.page-header .nav-tabs { - position: absolute; - left: 20px; - bottom: -1px; - margin-bottom: 0; +.icon-pinterest-sign:before { + content: "\f0d3"; } -.page-header .nav-tabs i { - margin-right: 10px; - font-size: 14px; +.icon-google-plus-sign:before { + content: "\f0d4"; } -.page-header .nav-tabs a:hover { - background-color: #ffffff; +.icon-google-plus:before { + content: "\f0d5"; } -.prose h1, -.prose heading-1 h2, -.prose heading-2 { - margin-bottom: 15px; +.icon-money:before { + content: "\f0d6"; } -.prose h3, -.prose heading-3 { - margin-bottom: 10px; +.icon-caret-down:before { + content: "\f0d7"; } -.table-chunky td, -.table-chunky th { - padding: 12px 15px; - font-size: 12px; +.icon-caret-up:before { + content: "\f0d8"; } -.table-chunky thead th, -.table-chunky thead td { - color: #ffffff; - background-color: #aaaaaa; - padding-top: 10px; - padding-bottom: 10px; +.icon-caret-left:before { + content: "\f0d9"; } -.table-striped tbody tr:nth-child(odd) td, -.table-striped tbody tr:nth-child(odd) th { - background-color: transparent; +.icon-caret-right:before { + content: "\f0da"; } -.table-striped tbody tr:nth-child(even) td, -.table-striped tbody tr:nth-child(even) th { - background-color: #f2f2f2; +.icon-columns:before { + content: "\f0db"; } -.table-chunky.table-bordered { - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; +.icon-sort:before { + content: "\f0dc"; } -.table-chunky.table-bordered thead:first-child tr:first-child th:first-child, -.table-chunky.table-bordered tbody:first-child tr:first-child td:first-child { - -webkit-border-top-left-radius: 2px; - -moz-border-radius-topleft: 2px; - border-top-left-radius: 2px; +.icon-sort-down:before { + content: "\f0dd"; } -.table-chunky.table-bordered thead:first-child tr:first-child th:last-child, -.table-chunky.table-bordered tbody:first-child tr:first-child td:last-child { - -webkit-border-top-right-radius: 2px; - -moz-border-radius-topright: 2px; - border-top-right-radius: 2px; +.icon-sort-up:before { + content: "\f0de"; } -.table-chunky.table-bordered thead:last-child tr:last-child th:first-child, -.table-chunky.table-bordered tbody:last-child tr:last-child td:first-child { - -webkit-border-radius: 0 0 0 2px; - -moz-border-radius: 0 0 0 2px; - border-radius: 0 0 0 2px; - -webkit-border-bottom-left-radius: 2px; - -moz-border-radius-bottomleft: 2px; - border-bottom-left-radius: 2px; +.icon-envelope-alt:before { + content: "\f0e0"; } -.table-chunky.table-bordered thead:last-child tr:last-child th:last-child, -.table-chunky.table-bordered tbody:last-child tr:last-child td:last-child { - -webkit-border-bottom-right-radius: 2px; - -moz-border-radius-bottomright: 2px; - border-bottom-right-radius: 2px; +.icon-linkedin:before { + content: "\f0e1"; } -.ckan-icon { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; +.icon-undo:before { + content: "\f0e2"; } -.ckan-icon:last-child { - *margin-left: 0; +.icon-legal:before { + content: "\f0e3"; } -.ckan-icon-fb { - width: 16px; - height: 16px; - background-position: 0px 0; +.icon-dashboard:before { + content: "\f0e4"; } -.ckan-icon-gplus { - width: 16px; - height: 16px; - background-position: -16px 0; +.icon-comment-alt:before { + content: "\f0e5"; } -.ckan-icon-twitter { - width: 16px; - height: 16px; - background-position: -32px 0; +.icon-comments-alt:before { + content: "\f0e6"; } -.ckan-icon-email { - width: 16px; - height: 16px; - background-position: -48px 0; +.icon-bolt:before { + content: "\f0e7"; } -.ckan-icon-share { - width: 16px; - height: 16px; - background-position: -64px 0; +.icon-sitemap:before { + content: "\f0e8"; } -.ckan-icon-feed { - width: 16px; - height: 16px; - background-position: -80px 0; +.icon-umbrella:before { + content: "\f0e9"; } -.ckan-icon-calendar { - width: 16px; - height: 16px; - background-position: -96px 0; +.icon-paste:before { + content: "\f0ea"; } -.ckan-icon-file { - width: 16px; - height: 16px; - background-position: -112px 0; +.icon-lightbulb:before { + content: "\f0eb"; } -.ckan-icon-lock { - width: 16px; - height: 16px; - background-position: -128px 0; +.icon-exchange:before { + content: "\f0ec"; } -.ckan-icon-link-file { - width: 16px; - height: 16px; - background-position: -144px 0; +.icon-cloud-download:before { + content: "\f0ed"; } -.ckan-icon-link-plugin { - width: 16px; - height: 16px; - background-position: -160px 0; +.icon-cloud-upload:before { + content: "\f0ee"; } -.ckan-icon-upload-file { - width: 16px; - height: 16px; - background-position: -176px 0; +.icon-user-md:before { + content: "\f0f0"; } -.ckan-icon-callout { - width: 16px; - height: 16px; - background-position: -192px 0; +.icon-stethoscope:before { + content: "\f0f1"; } -.ckan-icon-circle-cross { - width: 17px; - height: 17px; - background-position: 0px -16px; +.icon-suitcase:before { + content: "\f0f2"; } -.ckan-icon-circle-add { - width: 17px; - height: 17px; - background-position: -17px -16px; +.icon-bell-alt:before { + content: "\f0f3"; } -.ckan-icon-flame { - width: 17px; - height: 17px; - background-position: -34px -16px; +.icon-coffee:before { + content: "\f0f4"; } -.ckan-icon-search { - width: 17px; - height: 17px; - background-position: -51px -16px; +.icon-food:before { + content: "\f0f5"; } -.ckan-icon-large-lock { - width: 20px; - height: 20px; - background-position: 0px -33px; +.icon-file-alt:before { + content: "\f0f6"; } -.ckan-icon-photo { - width: 20px; - height: 20px; - background-position: -20px -33px; +.icon-building:before { + content: "\f0f7"; } -.ckan-icon-add { - width: 20px; - height: 20px; - background-position: -40px -33px; +.icon-hospital:before { + content: "\f0f8"; } -.ckan-icon-home { - width: 20px; - height: 20px; - background-position: -60px -33px; +.icon-ambulance:before { + content: "\f0f9"; } -.ckan-icon-rewind { - width: 20px; - height: 20px; - background-position: -80px -33px; +.icon-medkit:before { + content: "\f0fa"; +} +.icon-fighter-jet:before { + content: "\f0fb"; +} +.icon-beer:before { + content: "\f0fc"; +} +.icon-h-sign:before { + content: "\f0fd"; +} +.icon-plus-sign-alt:before { + content: "\f0fe"; } -.ckan-icon-tools { - width: 20px; - height: 20px; - background-position: -100px -33px; +.icon-double-angle-left:before { + content: "\f100"; } -.ckan-icon-flag { - width: 20px; - height: 20px; - background-position: -120px -33px; +.icon-double-angle-right:before { + content: "\f101"; } -.ckan-icon-clipboard { - width: 20px; - height: 20px; - background-position: -140px -33px; +.icon-double-angle-up:before { + content: "\f102"; } -.ckan-icon-share { - width: 20px; - height: 20px; - background-position: -160px -33px; +.icon-double-angle-down:before { + content: "\f103"; } -.ckan-icon-info { - width: 20px; - height: 20px; - background-position: -180px -33px; +.icon-angle-left:before { + content: "\f104"; } -.ckan-icon-download { - width: 20px; - height: 20px; - background-position: -200px -33px; +.icon-angle-right:before { + content: "\f105"; } -.ckan-icon-star { - width: 20px; - height: 20px; - background-position: -220px -33px; +.icon-angle-up:before { + content: "\f106"; } -.ckan-icon-info-flat { - width: 20px; - height: 20px; - background-position: -240px -33px; +.icon-angle-down:before { + content: "\f107"; } -.ckan-icon-tag { - width: 20px; - height: 20px; - background-position: -260px -33px; +.icon-desktop:before { + content: "\f108"; } -.ckan-icon-plus { - width: 20px; - height: 20px; - background-position: -280px -33px; - width: 16px; +.icon-laptop:before { + content: "\f109"; } -.ckan-icon-head { - width: 20px; - height: 20px; - background-position: -300px -33px; +.icon-tablet:before { + content: "\f10a"; } -.ckan-icon-arrow-e { - width: 20px; - height: 20px; - background-position: -320px -33px; - width: 16px; +.icon-mobile-phone:before { + content: "\f10b"; } -.ckan-icon-bookmark { - width: 25px; - height: 25px; - background-position: 0px -53px; +.icon-circle-blank:before { + content: "\f10c"; } -.format-label { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - text-indent: -900em; - background: url("../../../base/images/sprite-resource-icons.png") no-repeat 0 0; +.icon-quote-left:before { + content: "\f10d"; } -.format-label:last-child { - *margin-left: 0; +.icon-quote-right:before { + content: "\f10e"; } -.format-label { - width: 32px; - height: 35px; - background-position: 0px -62px; +.icon-spinner:before { + content: "\f110"; } -.format-label[data-format=rdf], -.format-label[data-format*=rdf] { - width: 32px; - height: 35px; - background-position: -32px -62px; +.icon-circle:before { + content: "\f111"; } -.format-label[data-format=pdf], -.format-label[data-format*=pdf] { - width: 32px; - height: 35px; - background-position: -64px -62px; +.icon-reply:before { + content: "\f112"; } -.format-label[data-format=api], -.format-label[data-format*=api] { - width: 32px; - height: 35px; - background-position: -96px -62px; +.icon-github-alt:before { + content: "\f113"; } -.format-label[data-format=zip], -.format-label[data-format*=zip] { - width: 32px; - height: 35px; - background-position: -128px -62px; +.icon-folder-close-alt:before { + content: "\f114"; } -.format-label[data-format=xls], -.format-label[data-format*=xls] { - width: 32px; - height: 35px; - background-position: -160px -62px; +.icon-folder-open-alt:before { + content: "\f115"; } -.format-label[data-format=csv], -.format-label[data-format*=csv] { - width: 32px; - height: 35px; - background-position: -192px -62px; +[class^="icon-"], +[class*=" icon-"] { + display: inline-block; + text-align: right; + font-size: 14px; + line-height: 1; + width: 14px; } -.format-label[data-format=txt], -.format-label[data-format*=txt] { - width: 32px; - height: 35px; - background-position: -224px -62px; +.btn [class^="icon-"], +.nav [class^="icon-"], +.module-heading [class^="icon-"], +.dropdown [class^="icon-"], +.btn [class*=" icon-"], +.nav [class*=" icon-"], +.module-heading [class*=" icon-"], +.dropdown [class*=" icon-"] { + margin-right: 4px; } -.format-label[data-format=xml], -.format-label[data-format*=xml] { - width: 32px; - height: 35px; - background-position: -256px -62px; +.info-block [class^="icon-"], +.info-block [class*=" icon-"] { + float: left; + font-size: 28px; + width: 28px; + margin-right: 5px; + margin-top: 2px; } -.format-label[data-format=json], -.format-label[data-format*=json] { - width: 32px; - height: 35px; - background-position: -288px -62px; +.breadcrumb .home .icon-home { + font-size: 24px; + width: 24px; + vertical-align: -1px; } -.format-label[data-format=html], -.format-label[data-format*=html] { - width: 32px; - height: 35px; - background-position: -320px -62px; +.info-block-small [class^="icon-"], +.info-block-small [class*=" icon-"] { + font-size: 14px; + width: 14px; + margin-top: 1px; } -li [class^="icon-"], -li [class*=" icon-"] { - width: auto; +.wrapper { + *zoom: 1; + background-color: #FFF; + border: 1px solid #cccccc; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + position: relative; + background: #ffffff url("../../../base/images/nav.png") 0 0 repeat-y; + margin-bottom: 20px; } -li .icon-large:before, -li .icon-large:before { - width: auto; +.wrapper:before, +.wrapper:after { + display: table; + content: ""; + line-height: 0; +} +.wrapper:after { + clear: both; +} +.wrapper.no-nav { + background-image: none; } [role=main], .main { position: relative; - padding-top: 27px; - padding-bottom: 27px; - background-color: #efefef; + padding-top: 10px; + padding-bottom: 20px; + background: #eeeeee url("../../../base/images/bg.png"); } [role=main] { min-height: 350px; } .main:after, -.main:before, -[role=main]:after, -[role=main]:before { - content: ""; - position: absolute; - left: 0; - right: 0; - height: 7px; - background: #ffffff; - border-color: #c9c9c9; - border-style: solid; - border-width: 0; -} -.main:before, -[role=main]:before { - top: 0; - border-bottom-width: 1px; -} -.main:after, [role=main]:after { bottom: 0; border-top-width: 1px; } [role=main] .primary { - float: left; - margin-left: 20px; - width: 700px; + width: 717px; float: right; } [role=main] .secondary { - float: left; margin-left: 20px; width: 220px; margin-left: 0; float: left; } -.primary > :last-child, -.secondary > :last-child { - margin-bottom: 0; +.primary > :last-child, +.secondary > :last-child { + margin-bottom: 0; +} +.primary .primary { + float: left; + width: 467px; + margin-left: 0; + margin-bottom: 20px; +} +.primary .primary h1:first-child, +.primary .primary h2:first-child, +.primary .primary h3:first-child, +.primary .primary h4:first-child { + margin-top: 0; +} +.primary .tertiary { + float: left; + width: 180px; + margin-left: 20px; + margin-bottom: 20px; +} +.hero { + background: url("../../../base/images/background-tile.png"); +} +.hero:after { + background-color: rgba(0, 0, 0, 0.09); + background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: -ms-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0.15)), to(rgba(0, 0, 0, 0))); + background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-repeat: repeat-x; + background-color: #f6f6f6; + border-bottom: 1px solid #d0d0d0; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; + -webkit-box-shadow: inset 0 -4px 0 rgba(0, 0, 0, 0.03); + -moz-box-shadow: inset 0 -4px 0 rgba(0, 0, 0, 0.03); + box-shadow: inset 0 -4px 0 rgba(0, 0, 0, 0.03); +} +.hero:after .back:hover { + text-decoration: none; +} +.hero:after .back:hover span { + text-decoration: underline; +} +.context-info .module-content { + padding: 15px; +} +.context-info .image { + margin-bottom: 10px; +} +.context-info .image img, +.context-info .image a { + display: block; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.context-info p { + overflow: auto; +} +.context-info code { + display: block; + font-weight: normal; + padding: 0; + margin: 0; + overflow: auto; +} +.context-info h1.heading { + margin: 0 0 5px 0; + font-size: 18px; + line-height: 1.3; +} +.context-info .info { + margin-top: 15px; + padding-top: 10px; + border-top: 1px dotted #DDD; +} +.context-info .info dl dd { + margin-top: 3px; + margin-left: 0; +} +.context-info .nums { + *zoom: 1; + margin-top: 15px; + padding-top: 10px; + padding-bottom: 0; + border-top: 1px dotted #DDD; +} +.context-info .nums:before, +.context-info .nums:after { + display: table; + content: ""; + line-height: 0; +} +.context-info .nums:after { + clear: both; +} +.context-info .nums dl { + float: left; + width: 50%; + margin: 5px 0 0 0; + color: #444444; +} +.context-info .nums dl dt { + display: block; + font-size: 13px; + font-weight: 300; +} +.context-info .nums dl dd { + display: block; + font-size: 30px; + font-weight: 700; + line-height: 36px; + margin-left: 0; +} +.context-info .nums dl dd .smallest { + font-size: 13px; +} +.context-info .nums dl dd .smaller { + font-size: 16px; } -.hero { - background: url("../../../base/images/background-tile.png"); +.context-info .nums dl dd .small { + font-size: 21px; } -.hero:after { - background-color: rgba(0, 0, 0, 0.09); - background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: -ms-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0.15)), to(rgba(0, 0, 0, 0))); - background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-repeat: repeat-x; - background-color: transparent; - top: 7px; - bottom: auto; - height: 5px; +.context-info .follow_button { + margin-top: 15px; +} +.context-info.editing .module-content { + margin-top: 0; } .hero { - padding-bottom: 0; + background: url("../../../base/images/background-tile.png"); + padding: 20px 0; min-height: 0; } .hero > .container { position: relative; padding-bottom: 0; } -.hero-primary, -.hero-secondary { - float: left; - margin-left: 20px; - width: 460px; -} -.hero-primary { - margin-left: 0; -} -.hero-primary { - margin-left: 0; - margin-bottom: 0; -} -.hero-secondary { - position: absolute; - bottom: 0; - right: 0; -} -.hero-secondary-inner { - bottom: 0; - left: 0; - right: 0; -} -.hero .module-popup { - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - margin-top: 50px; +.hero .search-giant { + margin-bottom: 10px; } -.hero .module-popup .module-content { - padding-bottom: 2px; +.hero .search-giant input { + border-color: #003f52; } .hero .page-heading { font-size: 18px; @@ -6734,290 +7984,339 @@ li .icon-large:before { } .hero .module-dark { padding: 5px; - margin-bottom: 10px; + margin-bottom: 0; color: #ffffff; background: #ffffff; } .hero .module-dark .module-content { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - background-color: #dc0bdc; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; + background-color: #e73892; + border-bottom: none; } .hero .module-dark .module-content .heading { + margin-top: 0; margin-bottom: 7px; + font-size: 24px; + line-height: 40px; } .hero .tags { - margin-bottom: 9px; -} -.hero .tags .tag, -.hero .tags .tag-list { - display: inline-block; -} -.hero .tags .tag-list { - padding: 0; -} -.hero .tags .tag { - margin-right: 15px; -} -header.masthead { *zoom: 1; - color: #ffffff; - padding: 5px 10px 3px; - height: 55px; - background-color: #e512e5; - background-image: -moz-linear-gradient(top, #dc0bdc, #f31df3); - background-image: -ms-linear-gradient(top, #dc0bdc, #f31df3); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#dc0bdc), to(#f31df3)); - background-image: -webkit-linear-gradient(top, #dc0bdc, #f31df3); - background-image: -o-linear-gradient(top, #dc0bdc, #f31df3); - background-image: linear-gradient(top, #dc0bdc, #f31df3); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dc0bdc', endColorstr='#f31df3', GradientType=0); + padding: 5px 10px 10px 10px; + background-color: #d31979; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; } -header.masthead:before, -header.masthead:after { +.hero .tags:before, +.hero .tags:after { display: table; content: ""; + line-height: 0; } -header.masthead:after { +.hero .tags:after { clear: both; } -header.masthead .container { - position: relative; +.hero .tags h3, +.hero .tags .tag { + display: block; + float: left; + margin: 5px 10px 0 0; } -header.masthead a { - color: #ffffff; +.hero .tags h3 { + font-size: 14px; + line-height: 20px; + padding: 2px 8px; } -header.masthead hgroup h1, -header.masthead hgroup h2 { +.hero-primary, +.hero-secondary { float: left; - font-size: 34px; - line-height: 1.5; -} -header.masthead hgroup h1 { - font-weight: 900; - letter-spacing: -1px; + margin-left: 20px; + width: 460px; } -header.masthead hgroup h2 { - position: absolute; - bottom: -3px; - left: 0; - margin: 0; - font-size: 15px; - font-weight: normal; - line-height: 1.2; - white-space: nowrap; +.hero-primary { + margin-left: 0; + margin-bottom: 0; } -header.masthead .content { +.hero-secondary { position: absolute; - top: 10px; + bottom: 0; right: 0; } -header.masthead .section { - float: left; +.hero-secondary .hero-secondary-inner { + bottom: 0; + left: 0; + right: 0; } -header.masthead .navigation { - margin-right: 20px; +.main.homepage { + padding-top: 20px; + padding-bottom: 20px; + border-top: 1px solid #cccccc; } -header.masthead .navigation ul.unstyled { - *zoom: 1; - margin: 5px 0; +.main.homepage .module-heading .media-image { + margin-right: 15px; + max-height: 53px; + -webkit-box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.5); + -moz-box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.5); + box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.5); } -header.masthead .navigation ul.unstyled:before, -header.masthead .navigation ul.unstyled:after { - display: table; - content: ""; +.main.homepage .group-listing .box { + min-height: 275px; } -header.masthead .navigation ul.unstyled:after { - clear: both; +.main.homepage .group-list { + margin-bottom: 0; } -header.masthead .navigation ul.unstyled li { - display: block; - float: left; +.main.homepage .group-list .dataset-content { + min-height: 70px; } -header.masthead .navigation ul.unstyled li a { - display: block; - font-size: 12px; - font-weight: bold; - padding: 4px 10px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; +.main.homepage .box .module { + margin-top: 0; } -header.masthead .navigation ul.unstyled li a.active { - background-color: #de17de; - box-shadow: 0 -1px 0 #b012b0, 0 1px 0 #e130e1; +.account-masthead { + *zoom: 1; + min-height: 30px; + color: #ffffff; + background: #d31979 url("../../../base/images/bg.png"); } -header.masthead .site-search { - margin: 3px 0; +.account-masthead:before, +.account-masthead:after { + display: table; + content: ""; + line-height: 0; } -header.masthead .site-search input { - width: 190px; - font-size: 11px; - padding: 4px; +.account-masthead:after { + clear: both; } -header.masthead .account { - background: #ea0cea; - padding: 3px 5px; - margin: 2px 0 2px 30px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 2px 4px #d20bd2; - -moz-box-shadow: inset 0 2px 4px #d20bd2; - box-shadow: inset 0 2px 4px #d20bd2; +.account-masthead .account { + float: right; } -header.masthead .account ul.unstyled { +.account-masthead .account ul { *zoom: 1; } -header.masthead .account ul.unstyled:before, -header.masthead .account ul.unstyled:after { +.account-masthead .account ul:before, +.account-masthead .account ul:after { display: table; content: ""; + line-height: 0; } -header.masthead .account ul.unstyled:after { +.account-masthead .account ul:after { clear: both; } -header.masthead .account ul.unstyled li { +.account-masthead .account ul li { display: block; float: left; + border-left: 1px solid #bc176c; } -header.masthead .account ul.unstyled li a { +.account-masthead .account ul li a { display: block; - font-size: 12px; + color: #f9cde4; + font-size: 13px; font-weight: bold; - padding: 4px 10px; + padding: 0 10px; + line-height: 31px; +} +.account-masthead .account ul li a span.username { + margin: 0 2px 0 4px; } -header.masthead .account ul.unstyled li a.sub { +.account-masthead .account ul li a:hover { + color: #fbe1ef; + background-color: #bc176c; + text-decoration: none; +} +.account-masthead .account ul li a.sub { font-weight: 300; - border-left: 1px solid #d20bd2; } -header.masthead .account .dropdown { - float: left; +.account-masthead .account ul li a .btn { + vertical-align: 1px; + margin-left: 3px; } -header.masthead .account .button { - display: block; - text-decoration: none; - background-color: #dc0bdc; - color: #ee85ee; - text-shadow: 0 1px 1px #ab09ab; +.account-masthead .account .notifications a span { + font-size: 12px; + margin-left: 3px; + padding: 1px 6px; + background-color: #bc176c; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 #f30ef3; - -moz-box-shadow: inset 0 1px 0 #f30ef3; - box-shadow: inset 0 1px 0 #f30ef3; } -header.masthead .account .image { - margin: 2px 0; - padding: 0 4px 0 0; - overflow: hidden; - font-size: 10px; +.account-masthead .account .notifications a:hover span { + color: #ffffff; + background-color: #a5145f; +} +.account-masthead .account .notifications.notifications-important a span { + color: #ffffff; + background-color: #c9403a; +} +.account-masthead .account.authed .image { + padding: 0 6px; +} +.account-masthead .account.authed .image img { + vertical-align: -6px; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; } -header.masthead .account .image i { - vertical-align: -1px; +.masthead { + *zoom: 1; + min-height: 55px; + color: #ffffff; + background: #e73892 url("../../../base/images/bg.png"); } -header.masthead .account .image img { - opacity: 0.7; - border-right: 1px solid #f31df3; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; +.masthead:before, +.masthead:after { + display: table; + content: ""; + line-height: 0; +} +.masthead:after { + clear: both; } -header.masthead .account .notifications { - padding: 4px 8px 3px 8px; - margin: 2px 5px 2px 0; +.masthead .container { + position: relative; } -header.masthead .account .notifications.notifications-important { +.masthead a { color: #ffffff; - background-color: #c9403a; - text-shadow: 0 1px 1px #a3322d; - -webkit-box-shadow: inset 0 1px 0 #ce534e; - -moz-box-shadow: inset 0 1px 0 #ce534e; - box-shadow: inset 0 1px 0 #ce534e; } -header.masthead .account .dropdown.open .image img, -header.masthead .account .dropdown .image:hover img { - opacity: 1; - border-right-color: #f64df6; +.masthead hgroup h1, +.masthead hgroup h2 { + float: left; + font-size: 30px; + line-height: 1.5; } -header.masthead .account .dropdown.open .button, -header.masthead .account .dropdown .button:hover { - color: #ffffff; - background-color: #ea6dea; - -webkit-box-shadow: inset 0 1px 0 #ee85ee; - -moz-box-shadow: inset 0 1px 0 #ee85ee; - box-shadow: inset 0 1px 0 #ee85ee; - text-decoration: none; +.masthead hgroup h1 { + font-weight: 900; + letter-spacing: -1px; + margin: 3px 0; +} +.masthead hgroup h2 { + position: absolute; + bottom: -3px; + left: 0; + margin: 0; + font-size: 15px; + font-weight: normal; + line-height: 1.2; + white-space: nowrap; } -header.masthead .account .dropdown.open .notifications-important, -header.masthead .account .dropdown .notifications-important:hover { - background-color: #d46762; - text-shadow: 0 1px 1px #c9403a; - -webkit-box-shadow: inset 0 1px 0 #d97a76; - -moz-box-shadow: inset 0 1px 0 #d97a76; - box-shadow: inset 0 1px 0 #d97a76; +.masthead .content { + position: absolute; + top: 10px; + right: 0; } -header.masthead .account.authed { - margin: 0 0 0 30px; +.masthead .section { + float: left; } -header.masthead .account.not-authed { - padding-top: 2px; - padding-bottom: 2px; +.masthead input[type="text"] { + border-color: #e42186; } -header.masthead .dropdown-menu { - margin-top: -1px; +.masthead .navigation { + margin-right: 20px; } -header.masthead .user-dropdown-menu a { - color: #dc0bdc; +.masthead .navigation .nav-pills { + margin-bottom: 0; } -header.masthead .user-dropdown-menu a:hover { - color: #ffffff; +.masthead .navigation .nav-pills li a:hover, +.masthead .navigation .nav-pills li.active a { + background-color: #d31979; } -header.masthead .debug { +.masthead .site-search { + margin: 2px 8px 2px 0; +} +.masthead .site-search input { + width: 200px; + padding: 4px 10px; +} +.masthead .debug { position: absolute; - bottom: 10px; + top: 37px; left: 10px; - font-size: 11px; color: rgba(255, 255, 255, 0.5); - line-height: 1.2; } .site-footer { *zoom: 1; + min-height: 55px; color: #ffffff; - padding: 5px 10px 3px; - height: 55px; - background-color: #e512e5; - background-image: -moz-linear-gradient(top, #dc0bdc, #f31df3); - background-image: -ms-linear-gradient(top, #dc0bdc, #f31df3); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#dc0bdc), to(#f31df3)); - background-image: -webkit-linear-gradient(top, #dc0bdc, #f31df3); - background-image: -o-linear-gradient(top, #dc0bdc, #f31df3); - background-image: linear-gradient(top, #dc0bdc, #f31df3); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dc0bdc', endColorstr='#f31df3', GradientType=0); - font-size: 12px; + background: #e73892 url("../../../base/images/bg.png"); padding: 20px 0; } .site-footer:before, .site-footer:after { display: table; content: ""; + line-height: 0; } .site-footer:after { clear: both; } +.site-footer .container { + position: relative; +} +.site-footer a { + color: #ffffff; +} +.site-footer hgroup h1, +.site-footer hgroup h2 { + float: left; + font-size: 30px; + line-height: 1.5; +} +.site-footer hgroup h1 { + font-weight: 900; + letter-spacing: -1px; + margin: 3px 0; +} +.site-footer hgroup h2 { + position: absolute; + bottom: -3px; + left: 0; + margin: 0; + font-size: 15px; + font-weight: normal; + line-height: 1.2; + white-space: nowrap; +} +.site-footer .content { + position: absolute; + top: 10px; + right: 0; +} +.site-footer .section { + float: left; +} +.site-footer input[type="text"] { + border-color: #e42186; +} +.site-footer .navigation { + margin-right: 20px; +} +.site-footer .navigation .nav-pills { + margin-bottom: 0; +} +.site-footer .navigation .nav-pills li a:hover, +.site-footer .navigation .nav-pills li.active a { + background-color: #d31979; +} +.site-footer .site-search { + margin: 2px 8px 2px 0; +} +.site-footer .site-search input { + width: 200px; + padding: 4px 10px; +} +.site-footer .debug { + position: absolute; + top: 37px; + left: 10px; + color: rgba(255, 255, 255, 0.5); +} .site-footer, .site-footer label, .site-footer small { - color: #ccdee3; + color: #f5afd3; } .site-footer a { - color: #ccdee3; + color: #f5afd3; } .footer-links, .attribution { @@ -7025,22 +8324,27 @@ header.masthead .debug { margin-left: 20px; width: 460px; } -.footer-links { +.footer-links { + margin-left: 0; +} +.footer-links ul { + float: left; + margin-left: 20px; + width: 220px; +} +.footer-links ul:first-child { margin-left: 0; } -.footer-links li { - display: inline-block; - width: 40%; - margin-right: 5%; +.footer-links ul li { margin-bottom: 5px; } .attribution small { - color: #ccdee3; + color: #f5afd3; font-size: 12px; } .attribution .ckan-footer-logo { display: block; - width: 65px; + width: 68px; height: 21px; margin-top: 2px; background: url("../../../base/images/ckan-logo-footer.png") no-repeat top left; @@ -7053,6 +8357,7 @@ header.masthead .debug { .lang-select:after { display: table; content: ""; + line-height: 0; } .lang-select:after { clear: both; @@ -7069,153 +8374,66 @@ header.masthead .debug { .lang-dropdown li { width: auto; } -.lang-dropdown .select2-result-label[data-value]:before { - content: ""; - display: inline-block; - background-image: url("../../../base/images/flags.png"); - background-repeat: no-repeat; - background-position: 0 11px; - width: 17px; - height: 11px; - position: relative; - top: 1px; -} -.lang-dropdown .select2-result-label[data-value*="/en/"]:before { - background-position: 0 0; -} -.lang-dropdown .select2-result-label[data-value*="/de/"]:before { - background-position: 0 -11px; -} -.lang-dropdown .select2-result-label[data-value*="/fr/"]:before { - background-position: 0 -22px; -} -.lang-dropdown .select2-result-label[data-value*="/it/"]:before { - background-position: 0 -33px; -} -.lang-dropdown .select2-result-label[data-value*="/es/"]:before { - background-position: 0 -44px; -} -.lang-dropdown .select2-result-label[data-value*="/pl/"]:before { - background-position: 0 -55px; +.table-selected td { + background-color: #f5f5f5; } -.lang-dropdown .select2-result-label[data-value*="/ru/"]:before { - background-position: 0 -66px; +.table-selected td .edit { + display: block; } -.lang-dropdown .select2-result-label[data-value*="/nl/"]:before { - background-position: 0 -77px; +.table-bulk-edit th input { + top: -5px; } -.lang-dropdown .select2-result-label[data-value*="/sv/"]:before { - background-position: 0 -88px; +.table-bulk-edit .table-actions .btn-group { + float: left; + margin: 0 10px 0 0; } -.lang-dropdown .select2-result-label[data-value*="/no/"]:before { - background-position: 0 -99px; +.table-bulk-edit .context p { + margin-bottom: 0; } -.lang-dropdown .select2-result-label[data-value*="/cs/"]:before, -.lang-dropdown .select2-result-label[data-value*="/cs_CZ/"]:before { - background-position: 0 -110px; +.table-header thead th { + background-color: #f6f6f6; } -.lang-dropdown .select2-result-label[data-value*="/hu/"]:before { - background-position: 0 -121px; +.table-edit-hover .edit { + display: none; + float: right; } -.lang-dropdown .select2-result-label[data-value*="/pt_BR/"]:before { - background-position: 0 -132px; +.table-edit-hover tr:hover .edit { + display: block; } -.lang-dropdown .select2-result-label[data-value*="/fi/"]:before { - background-position: 0 -143px; +.js .table-toggle-more .toggle-more { + display: none; } -.lang-dropdown .select2-result-label[data-value*="/bg/"]:before { - background-position: 0 -154px; +.js .table-toggle-more .show-more { + display: inline; } -.lang-dropdown .select2-result-label[data-value*="/ca/"]:before { - background-position: 0 -165px; +.js .table-toggle-more .show-less { + display: none; } -.lang-dropdown .select2-result-label[data-value*="/sq/"]:before { - background-position: 0 -176px; +.js .table-toggle-more .toggle-seperator { + display: table-row; } -.lang-dropdown .select2-result-label[data-value*="/sr/"]:before, -.lang-dropdown .select2-result-label[data-value*="/sr_Latn/"]:before { - background-position: 0 -187px; +.js .table-toggle-more .toggle-seperator td { + height: 11px; + padding: 0; + background-image: url("../../../base/images/table-seperator.png"); } -.lang-dropdown .select2-result-label[data-value*="/zh_TW/"]:before { - background-position: 0 -198px; +.js .table .toggle-show td { + background: none; + text-align: center; } -.lang-dropdown .select2-result-label[data-value*="/lv/"]:before { - background-position: 0 -209px; +.js .table-toggle-less .show-less { + display: inline; } -.lang-dropdown .select2-result-label[data-value*="/sk/"]:before { - background-position: 0 -220px; +.js .table-toggle-less .show-more { + display: none; } -.lang-dropdown .select2-result-label[data-value*="/pt_BR/"]:before { - background-position: 0 -132px; +.js .table-toggle-less .toggle-seperator { + display: none; } .profile .empty, .profile .dataset-list { margin-bottom: 20px; } -.profile-info .module-content { - padding: 15px; -} -.profile-info .avatar { - border: 1px solid #DDD; - padding: 5px; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; -} -.profile-info .avatar img, -.profile-info .avatar a { - display: block; -} -.profile-info code { - font-weight: normal; - padding: 0; - margin: 0; -} -.profile-info h1.heading { - margin: 10px 0 5px 0; - font-size: 21px; -} -.profile-info .info { - margin-top: 15px; - padding-top: 10px; - border-top: 1px dotted #DDD; -} -.profile-info .info dl dd { - margin-top: 3px; - margin-left: 0; -} -.profile-info .nums { - *zoom: 1; - margin-top: 15px; - padding-top: 10px; - padding-bottom: 0; - border-top: 1px dotted #DDD; -} -.profile-info .nums:before, -.profile-info .nums:after { - display: table; - content: ""; -} -.profile-info .nums:after { - clear: both; -} -.profile-info .nums dl { - float: left; - width: 33%; - margin: 5px 0 0 0; - color: #4d4d4d; -} -.profile-info .nums dl dt { - display: block; - font-weight: 300; -} -.profile-info .nums dl dd { - display: block; - font-size: 30px; - font-weight: 700; - line-height: 1.2; - margin-left: 0; -} .activity { margin: 10px 0; padding: 0; @@ -7232,13 +8450,16 @@ header.masthead .debug { .activity .item:after { display: table; content: ""; + line-height: 0; } .activity .item:after { clear: both; } -.activity .item i { +.activity .item .icon { display: block; - float: left; + position: absolute; + top: 0; + left: 0; width: 30px; height: 30px; line-height: 30px; @@ -7246,7 +8467,6 @@ header.masthead .debug { color: #ffffff; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); font-weight: normal; - font-size: 16px; margin-right: 10px; -webkit-border-radius: 100px; -moz-border-radius: 100px; @@ -7261,20 +8481,19 @@ header.masthead .debug { border-radius: 100px; } .activity .item .actor .gravatar { - float: left; - margin-top: -5px; - margin-right: 10px; + position: absolute; + top: 0; + left: 40px; } .activity .item p { font-size: 14px; line-height: 1.5; - margin: 5px 0 0 0; + margin: 5px 0 0 80px; } .activity .item .date { color: #999; font-size: 12px; white-space: nowrap; - margin-left: 5px; } .activity .item .new { display: block; @@ -7294,106 +8513,278 @@ header.masthead .debug { -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } -.popover .about { - margin-bottom: 10px; +.activity .load-less { + margin-bottom: 15px; +} +.popover { + width: 300px; +} +.popover .popover-title { + font-weight: bold; + margin-bottom: 0; +} +.popover p.about { + margin: 0 0 10px 0; } .popover .popover-close { float: right; text-decoration: none; } -.activity .item i { - background-color: #767dce; +.activity .item .icon { + background-color: #999999; } -.activity .item.added-tag i { +.activity .item.added-tag .icon { background-color: #6995a6; } -.activity .item.changed-group i { +.activity .item.changed-group .icon { background-color: #767dce; } -.activity .item.changed-package i { +.activity .item.changed-package .icon { background-color: #8c76ce; } -.activity .item.changed-package_extra i { +.activity .item.changed-package_extra .icon { background-color: #769ace; } -.activity .item.changed-resource i { +.activity .item.changed-resource .icon { background-color: #aa76ce; } -.activity .item.changed-user i { +.activity .item.changed-user .icon { background-color: #76b8ce; } -.activity .item.deleted-group i { +.activity .item.changed-organization .icon { + background-color: #699fa6; +} +.activity .item.deleted-group .icon { background-color: #b95252; } -.activity .item.deleted-package i { +.activity .item.deleted-package .icon { background-color: #b97452; } -.activity .item.deleted-package_extra i { +.activity .item.deleted-package_extra .icon { background-color: #b95274; } -.activity .item.deleted-resource i { +.activity .item.deleted-resource .icon { background-color: #b99752; } -.activity .item.new-group i { +.activity .item.deleted-organization .icon { + background-color: #b95297; +} +.activity .item.new-group .icon { background-color: #69a67a; } -.activity .item.new-package i { +.activity .item.new-package .icon { background-color: #69a68e; } -.activity .item.new-package_extra i { +.activity .item.new-package_extra .icon { background-color: #6ca669; } -.activity .item.new-resource i { +.activity .item.new-resource .icon { background-color: #81a669; } -.activity .item.new-user i { +.activity .item.new-user .icon { background-color: #69a6a3; } -.activity .item.removed-tag i { +.activity .item.new-organization .icon { + background-color: #81a669; +} +.activity .item.removed-tag .icon { background-color: #b95297; } -.activity .item.deleted-related-item i { +.activity .item.deleted-related-item .icon { background-color: #b9b952; } -.activity .item.follow-dataset i { +.activity .item.follow-dataset .icon { background-color: #767dce; } -.activity .item.follow-user i { +.activity .item.follow-user .icon { background-color: #8c76ce; } -.activity .item.new-related-item i { +.activity .item.new-related-item .icon { background-color: #95a669; } -.activity .item.follow-group i { +.activity .item.follow-group .icon { background-color: #8ba669; } -.popover-context-loading .popover-title { +.dropdown:hover .dropdown-menu { + display: block; +} +.js .dropdown .dropdown-menu, +.js .dropdown:hover .dropdown-menu { + display: none; +} +.js .dropdown.open .dropdown-menu { + display: block; +} +#followee-filter .btn { + *zoom: 1; +} +#followee-filter .btn:before, +#followee-filter .btn:after { + display: table; + content: ""; + line-height: 0; +} +#followee-filter .btn:after { + clear: both; +} +#followee-filter .btn span, +#followee-filter .btn strong { + display: block; + float: left; + line-height: 1.5; +} +#followee-filter .btn span { + font-weight: normal; +} +#followee-filter .btn strong { + margin: 0 5px; + white-space: nowrap; + max-width: 90px; + overflow: hidden; + text-overflow: ellipsis; +} +.dashboard-context { + position: relative; + margin-bottom: 20px; + padding: 20px; + border-bottom: 1px solid #DCDCDC; + background-color: #f6f6f6; + -webkit-border-radius: 3px 0 0 0; + -moz-border-radius: 3px 0 0 0; + border-radius: 3px 0 0 0; +} +.dashboard-context h2 { + margin-bottom: 10px; +} +.dashboard-context .arrow { + position: absolute; + content: ' '; + top: 30px; + right: -10px; + width: 10px; + height: 21px; + background: transparent url("../../../base/images/dashboard-followee-related.png"); +} +.popover-followee .popover-title { display: none; } -.popover-context-loading .popover-content { +.popover-followee .popover-content { + padding: 0; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } -.popover-context-loading .popover-content img { - vertical-align: -3px; - margin-right: 10px; +.popover-followee .empty { + padding: 10px; } -.follower-list li { - margin: 0 0 15px 0; +.popover-followee .popover-header { + *zoom: 1; + background-color: whiteSmoke; + padding: 5px; + border-bottom: 1px solid #cccccc; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } -.follower-list .gravatar { - vertical-align: -4px; - margin-right: 3px; +.popover-followee .popover-header:before, +.popover-followee .popover-header:after { + display: table; + content: ""; + line-height: 0; +} +.popover-followee .popover-header:after { + clear: both; +} +.popover-followee .popover-header .input-prepend { + margin-bottom: 0; +} +.popover-followee .popover-header .add-on, +.popover-followee .popover-header input { + float: left; + margin: 0; +} +.popover-followee .popover-header .add-on { + padding: 4px 8px 4px 12px; + border-right-width: 0; + -webkit-border-radius: 100px 0 0 100px; + -moz-border-radius: 100px 0 0 100px; + border-radius: 100px 0 0 100px; +} +.popover-followee .popover-header input { + padding: 4px 12px 4px 8px; + font-size: 13px; + width: 207px; + -webkit-border-radius: 0 100px 100px 0; + -moz-border-radius: 0 100px 100px 0; + border-radius: 0 100px 100px 0; +} +.popover-followee .nav { + padding: 0; + margin: 0; + max-height: 205px; + overflow: auto; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; +} +.popover-followee .nav li a { + display: block; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + padding: 7px 10px 7px 15px; + margin: 0; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.popover-followee .nav li a i { + background-color: #e73892; + color: #ffffff; + margin-right: 11px; + padding: 3px 5px; + line-height: 1; -webkit-border-radius: 100px; -moz-border-radius: 100px; border-radius: 100px; + -webkit-box-shadow: inset 0 1px 2x rgba(0, 0, 0, 0.2); + -moz-box-shadow: inset 0 1px 2x rgba(0, 0, 0, 0.2); + box-shadow: inset 0 1px 2x rgba(0, 0, 0, 0.2); } -.module-my-datasets .empty { - padding: 10px; +.popover-followee .nav li a:hover i { + background-color: #000; +} +.popover-followee .nav li.active a i { + color: #e73892; + background-color: #ffffff; +} +.dashboard-me { + *zoom: 1; + padding: 15px 15px 0 15px; +} +.dashboard-me:before, +.dashboard-me:after { + display: table; + content: ""; + line-height: 0; +} +.dashboard-me:after { + clear: both; +} +.dashboard-me img { + float: left; + margin-right: 10px; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; +} +.dashboard-me strong { + display: block; + font-size: 16px; + margin: 3px 0; } body { - background-color: #f31df3; + background: #e73892 url("../../../base/images/bg.png"); } [hidden] { display: none; @@ -7412,11 +8803,10 @@ table .metric { width: 140px; } code { - padding: 2px 2px; color: #000000; - font-weight: bold; border: none; background: none; + white-space: normal; } pre { border: none; @@ -7446,10 +8836,11 @@ iframe { text-indent: -999em; } .empty { - color: #aeaeae; + color: #aaaaaa; font-style: italic; } .page-heading { + margin-top: 0; margin-bottom: 16px; } .m-top { @@ -7492,10 +8883,6 @@ iframe { position: relative; top: -20px; } -.ie .module, -.ie .media-image { - border: 1px solid #cccccc; -} .ie .module-popup { border-bottom: none; } @@ -7519,24 +8906,19 @@ iframe { .ie9 .control-large input { height: 56px; } -.ie9 .module { - -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); - box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); +.ie8 .account-masthead a.image, +.ie8 .account-masthead .username { + white-space: nowrap; } -.ie7 .masthead nav ul li a.active, -.ie8 .masthead nav ul li a.active { - position: relative; - top: -1px; - background-color: #e60be6; - border-top: 1px solid #cd0acd; - border-bottom: 1px solid #f30ef3; +.ie9 .homepage .media.module-heading .media-image img, +.ie8 .homepage .media.module-heading .media-image img, +.ie7 .homepage .media.module-heading .media-image img { + width: 85px !important; } -.ie8 .masthead .account a.image { - display: block; - width: 25px; - padding-right: 10px; - white-space: nowrap; +.ie8 .hero .hero-primary.module-popup .box, +.ie7 .hero .hero-primary.module-popup .box { + padding-bottom: 20px !important; + margin-bottom: 0 !important; } .ie7 .alert { position: relative; @@ -7556,6 +8938,7 @@ iframe { .ie7 .tags .tag-list:after { display: table; content: ""; + line-height: 0; } .ie7 .tags .tag-list:after { clear: both; @@ -7569,8 +8952,6 @@ iframe { } .ie7 .tags .tag { display: block; - border: 1px solid #d0d0d0; - background: #f5f5f5; } .ie7 .search-giant input { width: 95%; @@ -7621,6 +9002,9 @@ iframe { .ie7 .stages li .highlight { width: auto; } +.ie7 .account-masthead .account a i { + line-height: 31px; +} .ie7 .masthead { position: relative; z-index: 1; @@ -7632,39 +9016,12 @@ iframe { *zoom: 1; } -.ie7 .masthead nav ul { - margin-top: 5px; -} -.ie7 .masthead nav ul li { - float: left; -} -.ie7 .masthead nav ul li a.active { - position: relative; - top: -1px; - background-color: #e60be6; - border-top: 1px solid #cd0acd; - border-bottom: 1px solid #f30ef3; -} .ie7 .masthead .header-image { display: block; } .ie7 .masthead .account .dropdown-menu { z-index: 10000; } -.ie7 .footer-links { - *zoom: 1; -} -.ie7 .footer-links:before, -.ie7 .footer-links:after { - display: table; - content: ""; -} -.ie7 .footer-links:after { - clear: both; -} -.ie7 .footer-links li { - float: left; -} .ie7 .module-narrow .nav-item.image { *zoom: 1; } @@ -7672,6 +9029,7 @@ iframe { .ie7 .module-narrow .nav-item.image:after { display: table; content: ""; + line-height: 0; } .ie7 .module-narrow .nav-item.image:after { clear: both; @@ -7689,11 +9047,13 @@ iframe { } .ie7 .module-heading { *zoom: 1; + position: relative; } .ie7 .module-heading:before, .ie7 .module-heading:after { display: table; content: ""; + line-height: 0; } .ie7 .module-heading:after { clear: both; @@ -7713,3 +9073,22 @@ iframe { position: relative; zoom: 1; } +.ie7 .resource-item { + position: static; + padding-bottom: 1px; +} +.ie7 .resource-item .heading { + position: relative; +} +.ie7 .resource-item .format-label { + left: -48px; +} +.ie7 .resource-item .btn-group { + position: relative; + float: right; + top: -35px; + right: 0; +} +.ie7 .media-overlay .media-heading { + background-color: #000; +} diff --git a/ckan/public/base/css/green.css b/ckan/public/base/css/green.css index 2694c58a461..1cc58fa82dc 100644 --- a/ckan/public/base/css/green.css +++ b/ckan/public/base/css/green.css @@ -48,11 +48,25 @@ sub { bottom: -0.25em; } img { + /* Responsive images (ensure images don't scale beyond their parents) */ + max-width: 100%; + /* Part 1: Set a maxium relative to the parent */ + + width: auto\9; + /* IE7-8 need help adjusting responsive images */ + + height: auto; + /* Part 2: Scale the height according to the width, otherwise you get stretching */ + vertical-align: middle; border: 0; -ms-interpolation-mode: bicubic; } +#map_canvas img, +.google-maps img { + max-width: none; +} button, input, select, @@ -72,11 +86,21 @@ input::-moz-focus-inner { border: 0; } button, -input[type="button"], +html input[type="button"], input[type="reset"], input[type="submit"] { - cursor: pointer; -webkit-appearance: button; + cursor: pointer; +} +label, +select, +button, +input[type="button"], +input[type="reset"], +input[type="submit"], +input[type="radio"], +input[type="checkbox"] { + cursor: pointer; } input[type="search"] { -webkit-box-sizing: content-box; @@ -92,6 +116,57 @@ textarea { overflow: auto; vertical-align: top; } +@media print { + * { + text-shadow: none !important; + color: #000 !important; + background: transparent !important; + box-shadow: none !important; + } + a, + a:visited { + text-decoration: underline; + } + a[href]:after { + content: " (" attr(href) ")"; + } + abbr[title]:after { + content: " (" attr(title) ")"; + } + .ir a:after, + a[href^="javascript:"]:after, + a[href^="#"]:after { + content: ""; + } + pre, + blockquote { + border: 1px solid #999; + page-break-inside: avoid; + } + thead { + display: table-header-group; + } + tr, + img { + page-break-inside: avoid; + } + img { + max-width: 100% !important; + } + @page { + margin: 0.5cm; + } + p, + h2, + h3 { + orphans: 3; + widows: 3; + } + h2, + h3 { + page-break-after: avoid; + } +} .clearfix { *zoom: 1; } @@ -99,6 +174,7 @@ textarea { .clearfix:after { display: table; content: ""; + line-height: 0; } .clearfix:after { clear: both; @@ -113,28 +189,47 @@ textarea { .input-block-level { display: block; width: 100%; - min-height: 28px; + min-height: 30px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; } body { margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; - color: #4d4d4d; - background-color: #efefef; + font-size: 14px; + line-height: 20px; + color: #444444; + background-color: #eeeeee; } a { - color: #045b04; + color: #2f9b45; text-decoration: none; } -a:hover { - color: #011201; +a:hover, +a:focus { + color: #1d602b; text-decoration: underline; } +.img-rounded { + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.img-polaroid { + padding: 4px; + background-color: #fff; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); +} +.img-circle { + -webkit-border-radius: 500px; + -moz-border-radius: 500px; + border-radius: 500px; +} .row { margin-left: -20px; *zoom: 1; @@ -143,15 +238,18 @@ a:hover { .row:after { display: table; content: ""; + line-height: 0; } .row:after { clear: both; } [class*="span"] { float: left; + min-height: 1px; margin-left: 20px; } .container, +.navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 940px; @@ -236,6 +334,7 @@ a:hover { .row-fluid:after { display: table; content: ""; + line-height: 0; } .row-fluid:after { clear: both; @@ -243,65 +342,171 @@ a:hover { .row-fluid [class*="span"] { display: block; width: 100%; - min-height: 28px; + min-height: 30px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; float: left; - margin-left: 2.127659574%; - *margin-left: 2.0744680846382977%; + margin-left: 2.127659574468085%; + *margin-left: 2.074468085106383%; } .row-fluid [class*="span"]:first-child { margin-left: 0; } +.row-fluid .controls-row [class*="span"] + [class*="span"] { + margin-left: 2.127659574468085%; +} .row-fluid .span12 { - width: 99.99999998999999%; - *width: 99.94680850063828%; + width: 100%; + *width: 99.94680851063829%; } .row-fluid .span11 { - width: 91.489361693%; - *width: 91.4361702036383%; + width: 91.48936170212765%; + *width: 91.43617021276594%; } .row-fluid .span10 { - width: 82.97872339599999%; - *width: 82.92553190663828%; + width: 82.97872340425532%; + *width: 82.92553191489361%; } .row-fluid .span9 { - width: 74.468085099%; - *width: 74.4148936096383%; + width: 74.46808510638297%; + *width: 74.41489361702126%; } .row-fluid .span8 { - width: 65.95744680199999%; - *width: 65.90425531263828%; + width: 65.95744680851064%; + *width: 65.90425531914893%; } .row-fluid .span7 { - width: 57.446808505%; - *width: 57.3936170156383%; + width: 57.44680851063829%; + *width: 57.39361702127659%; } .row-fluid .span6 { - width: 48.93617020799999%; - *width: 48.88297871863829%; + width: 48.93617021276595%; + *width: 48.88297872340425%; } .row-fluid .span5 { - width: 40.425531911%; - *width: 40.3723404216383%; + width: 40.42553191489362%; + *width: 40.37234042553192%; } .row-fluid .span4 { - width: 31.914893614%; - *width: 31.8617021246383%; + width: 31.914893617021278%; + *width: 31.861702127659576%; } .row-fluid .span3 { - width: 23.404255317%; - *width: 23.3510638276383%; + width: 23.404255319148934%; + *width: 23.351063829787233%; } .row-fluid .span2 { - width: 14.89361702%; - *width: 14.8404255306383%; + width: 14.893617021276595%; + *width: 14.840425531914894%; } .row-fluid .span1 { - width: 6.382978723%; - *width: 6.329787233638298%; + width: 6.382978723404255%; + *width: 6.329787234042553%; +} +.row-fluid .offset12 { + margin-left: 104.25531914893617%; + *margin-left: 104.14893617021275%; +} +.row-fluid .offset12:first-child { + margin-left: 102.12765957446808%; + *margin-left: 102.02127659574467%; +} +.row-fluid .offset11 { + margin-left: 95.74468085106382%; + *margin-left: 95.6382978723404%; +} +.row-fluid .offset11:first-child { + margin-left: 93.61702127659574%; + *margin-left: 93.51063829787232%; +} +.row-fluid .offset10 { + margin-left: 87.23404255319149%; + *margin-left: 87.12765957446807%; +} +.row-fluid .offset10:first-child { + margin-left: 85.1063829787234%; + *margin-left: 84.99999999999999%; +} +.row-fluid .offset9 { + margin-left: 78.72340425531914%; + *margin-left: 78.61702127659572%; +} +.row-fluid .offset9:first-child { + margin-left: 76.59574468085106%; + *margin-left: 76.48936170212764%; +} +.row-fluid .offset8 { + margin-left: 70.2127659574468%; + *margin-left: 70.10638297872339%; +} +.row-fluid .offset8:first-child { + margin-left: 68.08510638297872%; + *margin-left: 67.9787234042553%; +} +.row-fluid .offset7 { + margin-left: 61.70212765957446%; + *margin-left: 61.59574468085106%; +} +.row-fluid .offset7:first-child { + margin-left: 59.574468085106375%; + *margin-left: 59.46808510638297%; +} +.row-fluid .offset6 { + margin-left: 53.191489361702125%; + *margin-left: 53.085106382978715%; +} +.row-fluid .offset6:first-child { + margin-left: 51.063829787234035%; + *margin-left: 50.95744680851063%; +} +.row-fluid .offset5 { + margin-left: 44.68085106382979%; + *margin-left: 44.57446808510638%; +} +.row-fluid .offset5:first-child { + margin-left: 42.5531914893617%; + *margin-left: 42.4468085106383%; +} +.row-fluid .offset4 { + margin-left: 36.170212765957444%; + *margin-left: 36.06382978723405%; +} +.row-fluid .offset4:first-child { + margin-left: 34.04255319148936%; + *margin-left: 33.93617021276596%; +} +.row-fluid .offset3 { + margin-left: 27.659574468085104%; + *margin-left: 27.5531914893617%; +} +.row-fluid .offset3:first-child { + margin-left: 25.53191489361702%; + *margin-left: 25.425531914893618%; +} +.row-fluid .offset2 { + margin-left: 19.148936170212764%; + *margin-left: 19.04255319148936%; +} +.row-fluid .offset2:first-child { + margin-left: 17.02127659574468%; + *margin-left: 16.914893617021278%; +} +.row-fluid .offset1 { + margin-left: 10.638297872340425%; + *margin-left: 10.53191489361702%; +} +.row-fluid .offset1:first-child { + margin-left: 8.51063829787234%; + *margin-left: 8.404255319148938%; +} +[class*="span"].hide, +.row-fluid [class*="span"].hide { + display: none; +} +[class*="span"].pull-right, +.row-fluid [class*="span"].pull-right { + float: right; } .container { margin-right: auto; @@ -312,6 +517,7 @@ a:hover { .container:after { display: table; content: ""; + line-height: 0; } .container:after { clear: both; @@ -325,25 +531,75 @@ a:hover { .container-fluid:after { display: table; content: ""; + line-height: 0; } .container-fluid:after { clear: both; } p { - margin: 0 0 9px; - font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; -} -p small { - font-size: 11px; - color: #999999; + margin: 0 0 10px; } .lead { - margin-bottom: 18px; - font-size: 20px; + margin-bottom: 20px; + font-size: 21px; font-weight: 200; - line-height: 27px; + line-height: 30px; +} +small { + font-size: 85%; +} +strong { + font-weight: bold; +} +em { + font-style: italic; +} +cite { + font-style: normal; +} +.muted { + color: #999999; +} +a.muted:hover, +a.muted:focus { + color: #808080; +} +.text-warning { + color: #c09853; +} +a.text-warning:hover, +a.text-warning:focus { + color: #a47e3c; +} +.text-error { + color: #b55457; +} +a.text-error:hover, +a.text-error:focus { + color: #954143; +} +.text-info { + color: #3a87ad; +} +a.text-info:hover, +a.text-info:focus { + color: #2d6987; +} +.text-success { + color: #468847; +} +a.text-success:hover, +a.text-success:focus { + color: #356635; +} +.text-left { + text-align: left; +} +.text-right { + text-align: right; +} +.text-center { + text-align: center; } h1, h2, @@ -351,9 +607,10 @@ h3, h4, h5, h6 { - margin: 0; + margin: 10px 0; font-family: inherit; font-weight: bold; + line-height: 20px; color: inherit; text-rendering: optimizelegibility; } @@ -364,60 +621,53 @@ h4 small, h5 small, h6 small { font-weight: normal; + line-height: 1; color: #999999; } -h1 { - font-size: 30px; - line-height: 36px; +h1, +h2, +h3 { + line-height: 40px; } -h1 small { - font-size: 18px; +h1 { + font-size: 38.5px; } h2 { - font-size: 24px; - line-height: 36px; -} -h2 small { - font-size: 18px; + font-size: 31.5px; } h3 { - font-size: 18px; - line-height: 27px; + font-size: 24.5px; } -h3 small { +h4 { + font-size: 17.5px; +} +h5 { font-size: 14px; } -h4, -h5, h6 { - line-height: 18px; + font-size: 11.9px; } -h4 { - font-size: 14px; +h1 small { + font-size: 24.5px; } -h4 small { - font-size: 12px; +h2 small { + font-size: 17.5px; } -h5 { - font-size: 12px; +h3 small { + font-size: 14px; } -h6 { - font-size: 11px; - color: #999999; - text-transform: uppercase; +h4 small { + font-size: 14px; } .page-header { - padding-bottom: 17px; - margin: 18px 0; + padding-bottom: 9px; + margin: 20px 0 30px; border-bottom: 1px solid #eeeeee; } -.page-header h1 { - line-height: 1; -} ul, ol { padding: 0; - margin: 0 0 9px 25px; + margin: 0 0 10px 25px; } ul ul, ul ol, @@ -425,37 +675,57 @@ ol ol, ol ul { margin-bottom: 0; } -ul { - list-style: disc; -} -ol { - list-style: decimal; -} li { - line-height: 18px; + line-height: 20px; } ul.unstyled, ol.unstyled { margin-left: 0; list-style: none; } +ul.inline, +ol.inline { + margin-left: 0; + list-style: none; +} +ul.inline > li, +ol.inline > li { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + padding-left: 5px; + padding-right: 5px; +} dl { - margin-bottom: 18px; + margin-bottom: 20px; } dt, dd { - line-height: 18px; + line-height: 20px; } dt { font-weight: bold; - line-height: 17px; } dd { - margin-left: 9px; + margin-left: 10px; +} +.dl-horizontal { + *zoom: 1; +} +.dl-horizontal:before, +.dl-horizontal:after { + display: table; + content: ""; + line-height: 0; +} +.dl-horizontal:after { + clear: both; } .dl-horizontal dt { float: left; - width: 120px; + width: 160px; clear: left; text-align: right; overflow: hidden; @@ -463,26 +733,18 @@ dd { white-space: nowrap; } .dl-horizontal dd { - margin-left: 130px; + margin-left: 180px; } hr { - margin: 18px 0; + margin: 20px 0; border: 0; border-top: 1px solid #eeeeee; border-bottom: 1px solid #ffffff; } -strong { - font-weight: bold; -} -em { - font-style: italic; -} -.muted { - color: #999999; -} -abbr[title] { +abbr[title], +abbr[data-original-title] { cursor: help; - border-bottom: 1px dotted #ddd; + border-bottom: 1px dotted #999999; } abbr.initialism { font-size: 90%; @@ -490,18 +752,18 @@ abbr.initialism { } blockquote { padding: 0 0 0 15px; - margin: 0 0 18px; + margin: 0 0 20px; border-left: 5px solid #eeeeee; } blockquote p { margin-bottom: 0; - font-size: 16px; + font-size: 17.5px; font-weight: 300; - line-height: 22.5px; + line-height: 1.25; } blockquote small { display: block; - line-height: 18px; + line-height: 20px; color: #999999; } blockquote small:before { @@ -518,6 +780,12 @@ blockquote.pull-right p, blockquote.pull-right small { text-align: right; } +blockquote.pull-right small:before { + content: ''; +} +blockquote.pull-right small:after { + content: '\00A0 \2014'; +} q:before, q:after, blockquote:before, @@ -526,20 +794,14 @@ blockquote:after { } address { display: block; - margin-bottom: 18px; - font-style: normal; - line-height: 18px; -} -small { - font-size: 100%; -} -cite { + margin-bottom: 20px; font-style: normal; + line-height: 20px; } code, pre { padding: 0 3px 2px; - font-family: Menlo, Monaco, Consolas, "Courier New", monospace; + font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 12px; color: #333333; -webkit-border-radius: 3px; @@ -551,13 +813,14 @@ code { color: #d14; background-color: #f7f7f9; border: 1px solid #e1e1e8; + white-space: nowrap; } pre { display: block; - padding: 8.5px; - margin: 0 0 9px; - font-size: 12.025px; - line-height: 18px; + padding: 9.5px; + margin: 0 0 10px; + font-size: 13px; + line-height: 20px; word-break: break-all; word-wrap: break-word; white-space: pre; @@ -570,11 +833,13 @@ pre { border-radius: 4px; } pre.prettyprint { - margin-bottom: 18px; + margin-bottom: 20px; } pre code { padding: 0; color: inherit; + white-space: pre; + white-space: pre-wrap; background-color: transparent; border: 0; } @@ -583,7 +848,7 @@ pre code { overflow-y: scroll; } form { - margin: 0 0 18px; + margin: 0 0 20px; } fieldset { padding: 0; @@ -594,15 +859,15 @@ legend { display: block; width: 100%; padding: 0; - margin-bottom: 27px; - font-size: 19.5px; - line-height: 36px; + margin-bottom: 20px; + font-size: 21px; + line-height: 40px; color: #333333; border: 0; - border-bottom: 1px solid #eee; + border-bottom: 1px solid #e5e5e5; } legend small { - font-size: 13.5px; + font-size: 15px; color: #999999; } label, @@ -610,9 +875,9 @@ input, button, select, textarea { - font-size: 13px; + font-size: 14px; font-weight: normal; - line-height: 18px; + line-height: 20px; } input, button, @@ -623,116 +888,181 @@ textarea { label { display: block; margin-bottom: 5px; - color: #333333; } -input, -textarea, select, +textarea, +input[type="text"], +input[type="password"], +input[type="datetime"], +input[type="datetime-local"], +input[type="date"], +input[type="month"], +input[type="time"], +input[type="week"], +input[type="number"], +input[type="email"], +input[type="url"], +input[type="search"], +input[type="tel"], +input[type="color"], .uneditable-input { display: inline-block; - width: 210px; - height: 18px; - padding: 4px; - margin-bottom: 9px; - font-size: 13px; - line-height: 18px; + height: 20px; + padding: 4px 6px; + margin-bottom: 10px; + font-size: 14px; + line-height: 20px; color: #555555; - background-color: #ffffff; - border: 1px solid #cccccc; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + vertical-align: middle; } -.uneditable-textarea { - width: auto; - height: auto; -} -label input, -label textarea, -label select { - display: block; +input, +textarea, +.uneditable-input { + width: 206px; } -input[type="image"], -input[type="checkbox"], -input[type="radio"] { - width: auto; +textarea { height: auto; - padding: 0; - margin: 3px 0; +} +textarea, +input[type="text"], +input[type="password"], +input[type="datetime"], +input[type="datetime-local"], +input[type="date"], +input[type="month"], +input[type="time"], +input[type="week"], +input[type="number"], +input[type="email"], +input[type="url"], +input[type="search"], +input[type="tel"], +input[type="color"], +.uneditable-input { + background-color: #ffffff; + border: 1px solid #cccccc; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border linear .2s, box-shadow linear .2s; + -moz-transition: border linear .2s, box-shadow linear .2s; + -o-transition: border linear .2s, box-shadow linear .2s; + transition: border linear .2s, box-shadow linear .2s; +} +textarea:focus, +input[type="text"]:focus, +input[type="password"]:focus, +input[type="datetime"]:focus, +input[type="datetime-local"]:focus, +input[type="date"]:focus, +input[type="month"]:focus, +input[type="time"]:focus, +input[type="week"]:focus, +input[type="number"]:focus, +input[type="email"]:focus, +input[type="url"]:focus, +input[type="search"]:focus, +input[type="tel"]:focus, +input[type="color"]:focus, +.uneditable-input:focus { + border-color: rgba(82, 168, 236, 0.8); + outline: 0; + outline: thin dotted \9; + /* IE6-9 */ + + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); +} +input[type="radio"], +input[type="checkbox"] { + margin: 4px 0 0; *margin-top: 0; /* IE7 */ - line-height: normal; - cursor: pointer; - background-color: transparent; - border: 0 \9; - /* IE9 and down */ + margin-top: 1px \9; + /* IE8-9 */ - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -input[type="image"] { - border: 0; -} -input[type="file"] { - width: auto; - padding: initial; - line-height: initial; - background-color: #ffffff; - background-color: initial; - border: initial; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; + line-height: normal; } -input[type="button"], +input[type="file"], +input[type="image"], +input[type="submit"], input[type="reset"], -input[type="submit"] { +input[type="button"], +input[type="radio"], +input[type="checkbox"] { width: auto; - height: auto; } select, input[type="file"] { - height: 28px; + height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ *margin-top: 4px; /* For IE7, add top margin to align select with labels */ - line-height: 28px; -} -input[type="file"] { - line-height: 18px \9; + line-height: 30px; } select { width: 220px; + border: 1px solid #cccccc; background-color: #ffffff; } select[multiple], select[size] { height: auto; } -input[type="image"] { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; +select:focus, +input[type="file"]:focus, +input[type="radio"]:focus, +input[type="checkbox"]:focus { + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; } -textarea { +.uneditable-input, +.uneditable-textarea { + color: #999999; + background-color: #fcfcfc; + border-color: #cccccc; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + cursor: not-allowed; +} +.uneditable-input { + overflow: hidden; + white-space: nowrap; +} +.uneditable-textarea { + width: auto; height: auto; } -input[type="hidden"] { - display: none; +input:-moz-placeholder, +textarea:-moz-placeholder { + color: #999999; +} +input:-ms-input-placeholder, +textarea:-ms-input-placeholder { + color: #999999; +} +input::-webkit-input-placeholder, +textarea::-webkit-input-placeholder { + color: #999999; } .radio, .checkbox { - min-height: 18px; - padding-left: 18px; + min-height: 20px; + padding-left: 20px; } .radio input[type="radio"], .checkbox input[type="checkbox"] { float: left; - margin-left: -18px; + margin-left: -20px; } .controls > .radio:first-child, .controls > .checkbox:first-child { @@ -749,39 +1079,6 @@ input[type="hidden"] { .checkbox.inline + .checkbox.inline { margin-left: 10px; } -input, -textarea { - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; -} -input:focus, -textarea:focus { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); -} -input[type="file"]:focus, -input[type="radio"]:focus, -input[type="checkbox"]:focus, -select:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} .input-mini { width: 60px; } @@ -811,46 +1108,105 @@ textarea[class*="span"], float: none; margin-left: 0; } +.input-append input[class*="span"], +.input-append .uneditable-input[class*="span"], +.input-prepend input[class*="span"], +.input-prepend .uneditable-input[class*="span"], +.row-fluid input[class*="span"], +.row-fluid select[class*="span"], +.row-fluid textarea[class*="span"], +.row-fluid .uneditable-input[class*="span"], +.row-fluid .input-prepend [class*="span"], +.row-fluid .input-append [class*="span"] { + display: inline-block; +} input, textarea, .uneditable-input { margin-left: 0; } -input.span12, textarea.span12, .uneditable-input.span12 { - width: 930px; -} -input.span11, textarea.span11, .uneditable-input.span11 { - width: 850px; -} -input.span10, textarea.span10, .uneditable-input.span10 { - width: 770px; -} -input.span9, textarea.span9, .uneditable-input.span9 { - width: 690px; -} -input.span8, textarea.span8, .uneditable-input.span8 { - width: 610px; -} -input.span7, textarea.span7, .uneditable-input.span7 { - width: 530px; -} -input.span6, textarea.span6, .uneditable-input.span6 { - width: 450px; +.controls-row [class*="span"] + [class*="span"] { + margin-left: 20px; } -input.span5, textarea.span5, .uneditable-input.span5 { - width: 370px; +input.span12, +textarea.span12, +.uneditable-input.span12 { + width: 926px; +} +input.span11, +textarea.span11, +.uneditable-input.span11 { + width: 846px; +} +input.span10, +textarea.span10, +.uneditable-input.span10 { + width: 766px; +} +input.span9, +textarea.span9, +.uneditable-input.span9 { + width: 686px; +} +input.span8, +textarea.span8, +.uneditable-input.span8 { + width: 606px; +} +input.span7, +textarea.span7, +.uneditable-input.span7 { + width: 526px; +} +input.span6, +textarea.span6, +.uneditable-input.span6 { + width: 446px; +} +input.span5, +textarea.span5, +.uneditable-input.span5 { + width: 366px; +} +input.span4, +textarea.span4, +.uneditable-input.span4 { + width: 286px; +} +input.span3, +textarea.span3, +.uneditable-input.span3 { + width: 206px; +} +input.span2, +textarea.span2, +.uneditable-input.span2 { + width: 126px; +} +input.span1, +textarea.span1, +.uneditable-input.span1 { + width: 46px; +} +.controls-row { + *zoom: 1; } -input.span4, textarea.span4, .uneditable-input.span4 { - width: 290px; +.controls-row:before, +.controls-row:after { + display: table; + content: ""; + line-height: 0; } -input.span3, textarea.span3, .uneditable-input.span3 { - width: 210px; +.controls-row:after { + clear: both; } -input.span2, textarea.span2, .uneditable-input.span2 { - width: 130px; +.controls-row [class*="span"], +.row-fluid .controls-row [class*="span"] { + float: left; } -input.span1, textarea.span1, .uneditable-input.span1 { - width: 50px; +.controls-row .checkbox[class*="span"], +.controls-row .radio[class*="span"] { + padding-top: 5px; } input[disabled], select[disabled], @@ -860,7 +1216,6 @@ select[readonly], textarea[readonly] { cursor: not-allowed; background-color: #eeeeee; - border-color: #ddd; } input[type="radio"][disabled], input[type="checkbox"][disabled], @@ -868,24 +1223,33 @@ input[type="radio"][readonly], input[type="checkbox"][readonly] { background-color: transparent; } -.control-group.warning > label, +.control-group.warning .control-label, .control-group.warning .help-block, .control-group.warning .help-inline { color: #c09853; } +.control-group.warning .checkbox, +.control-group.warning .radio, .control-group.warning input, .control-group.warning select, .control-group.warning textarea { color: #c09853; +} +.control-group.warning input, +.control-group.warning select, +.control-group.warning textarea { border-color: #c09853; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { border-color: #a47e3c; - -webkit-box-shadow: 0 0 6px #dbc59e; - -moz-box-shadow: 0 0 6px #dbc59e; - box-shadow: 0 0 6px #dbc59e; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; } .control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { @@ -893,24 +1257,33 @@ input[type="checkbox"][readonly] { background-color: #fcf8e3; border-color: #c09853; } -.control-group.error > label, +.control-group.error .control-label, .control-group.error .help-block, .control-group.error .help-inline { color: #b55457; } +.control-group.error .checkbox, +.control-group.error .radio, .control-group.error input, .control-group.error select, .control-group.error textarea { color: #b55457; +} +.control-group.error input, +.control-group.error select, +.control-group.error textarea { border-color: #b55457; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus { border-color: #954143; - -webkit-box-shadow: 0 0 6px #d49b9d; - -moz-box-shadow: 0 0 6px #d49b9d; - box-shadow: 0 0 6px #d49b9d; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d49b9d; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d49b9d; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d49b9d; } .control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { @@ -918,24 +1291,33 @@ input[type="checkbox"][readonly] { background-color: #f8f0f0; border-color: #b55457; } -.control-group.success > label, +.control-group.success .control-label, .control-group.success .help-block, .control-group.success .help-inline { color: #468847; } +.control-group.success .checkbox, +.control-group.success .radio, .control-group.success input, .control-group.success select, .control-group.success textarea { color: #468847; +} +.control-group.success input, +.control-group.success select, +.control-group.success textarea { border-color: #468847; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus { border-color: #356635; - -webkit-box-shadow: 0 0 6px #7aba7b; - -moz-box-shadow: 0 0 6px #7aba7b; - box-shadow: 0 0 6px #7aba7b; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; } .control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { @@ -943,59 +1325,78 @@ input[type="checkbox"][readonly] { background-color: #dff0d8; border-color: #468847; } -input:focus:required:invalid, -textarea:focus:required:invalid, -select:focus:required:invalid { +.control-group.info .control-label, +.control-group.info .help-block, +.control-group.info .help-inline { + color: #3a87ad; +} +.control-group.info .checkbox, +.control-group.info .radio, +.control-group.info input, +.control-group.info select, +.control-group.info textarea { + color: #3a87ad; +} +.control-group.info input, +.control-group.info select, +.control-group.info textarea { + border-color: #3a87ad; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); +} +.control-group.info input:focus, +.control-group.info select:focus, +.control-group.info textarea:focus { + border-color: #2d6987; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; +} +.control-group.info .input-prepend .add-on, +.control-group.info .input-append .add-on { + color: #3a87ad; + background-color: #d9edf7; + border-color: #3a87ad; +} +input:focus:invalid, +textarea:focus:invalid, +select:focus:invalid { color: #b94a48; border-color: #ee5f5b; } -input:focus:required:invalid:focus, -textarea:focus:required:invalid:focus, -select:focus:required:invalid:focus { +input:focus:invalid:focus, +textarea:focus:invalid:focus, +select:focus:invalid:focus { border-color: #e9322d; -webkit-box-shadow: 0 0 6px #f8b9b7; -moz-box-shadow: 0 0 6px #f8b9b7; box-shadow: 0 0 6px #f8b9b7; } .form-actions { - padding: 17px 20px 18px; - margin-top: 18px; - margin-bottom: 18px; + padding: 19px 20px 20px; + margin-top: 20px; + margin-bottom: 20px; background-color: #f5f5f5; - border-top: 1px solid #ddd; + border-top: 1px solid #e5e5e5; *zoom: 1; } .form-actions:before, .form-actions:after { display: table; content: ""; + line-height: 0; } .form-actions:after { clear: both; } -.uneditable-input { - overflow: hidden; - white-space: nowrap; - cursor: not-allowed; - background-color: #ffffff; - border-color: #eee; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -} -:-moz-placeholder { - color: #999999; -} -::-webkit-input-placeholder { - color: #999999; -} .help-block, .help-inline { - color: #555555; + color: #6a6a6a; } .help-block { display: block; - margin-bottom: 9px; + margin-bottom: 10px; } .help-inline { display: inline-block; @@ -1006,62 +1407,76 @@ select:focus:required:invalid:focus { vertical-align: middle; padding-left: 5px; } -.input-prepend, -.input-append { - margin-bottom: 5px; +.input-append, +.input-prepend { + display: inline-block; + margin-bottom: 10px; + vertical-align: middle; + font-size: 0; + white-space: nowrap; } -.input-prepend input, .input-append input, -.input-prepend select, +.input-prepend input, .input-append select, +.input-prepend select, +.input-append .uneditable-input, .input-prepend .uneditable-input, -.input-append .uneditable-input { +.input-append .dropdown-menu, +.input-prepend .dropdown-menu, +.input-append .popover, +.input-prepend .popover { + font-size: 14px; +} +.input-append input, +.input-prepend input, +.input-append select, +.input-prepend select, +.input-append .uneditable-input, +.input-prepend .uneditable-input { position: relative; margin-bottom: 0; *margin-left: 0; - vertical-align: middle; + vertical-align: top; -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } -.input-prepend input:focus, .input-append input:focus, -.input-prepend select:focus, +.input-prepend input:focus, .input-append select:focus, -.input-prepend .uneditable-input:focus, -.input-append .uneditable-input:focus { +.input-prepend select:focus, +.input-append .uneditable-input:focus, +.input-prepend .uneditable-input:focus { z-index: 2; } -.input-prepend .uneditable-input, -.input-append .uneditable-input { - border-left-color: #ccc; -} -.input-prepend .add-on, -.input-append .add-on { +.input-append .add-on, +.input-prepend .add-on { display: inline-block; width: auto; - height: 18px; + height: 20px; min-width: 16px; padding: 4px 5px; + font-size: 14px; font-weight: normal; - line-height: 18px; + line-height: 20px; text-align: center; text-shadow: 0 1px 0 #ffffff; - vertical-align: middle; background-color: #eeeeee; border: 1px solid #ccc; } -.input-prepend .add-on, .input-append .add-on, +.input-prepend .add-on, +.input-append .btn, .input-prepend .btn, -.input-append .btn { - margin-left: -1px; +.input-append .btn-group > .dropdown-toggle, +.input-prepend .btn-group > .dropdown-toggle { + vertical-align: top; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } -.input-prepend .active, -.input-append .active { +.input-append .active, +.input-prepend .active { background-color: #a9dba9; border-color: #46a546; } @@ -1082,12 +1497,21 @@ select:focus:required:invalid:focus { -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } -.input-append .uneditable-input { - border-right-color: #ccc; - border-left-color: #eee; +.input-append input + .btn-group .btn:last-child, +.input-append select + .btn-group .btn:last-child, +.input-append .uneditable-input + .btn-group .btn:last-child { + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; +} +.input-append .add-on, +.input-append .btn, +.input-append .btn-group { + margin-left: -1px; } .input-append .add-on:last-child, -.input-append .btn:last-child { +.input-append .btn:last-child, +.input-append .btn-group:last-child > .dropdown-toggle { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; @@ -1099,6 +1523,13 @@ select:focus:required:invalid:focus { -moz-border-radius: 0; border-radius: 0; } +.input-prepend.input-append input + .btn-group .btn, +.input-prepend.input-append select + .btn-group .btn, +.input-prepend.input-append .uneditable-input + .btn-group .btn { + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; +} .input-prepend.input-append .add-on:first-child, .input-prepend.input-append .btn:first-child { margin-right: -1px; @@ -1113,7 +1544,10 @@ select:focus:required:invalid:focus { -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } -.search-query { +.input-prepend.input-append .btn-group:first-child { + margin-left: 0; +} +input.search-query { padding-right: 14px; padding-right: 4px \9; padding-left: 14px; @@ -1121,9 +1555,36 @@ select:focus:required:invalid:focus { /* IE7-8 doesn't have border-radius, so don't indent the padding */ margin-bottom: 0; - -webkit-border-radius: 14px; - -moz-border-radius: 14px; - border-radius: 14px; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; +} +/* Allow for input prepend/append in search forms */ +.form-search .input-append .search-query, +.form-search .input-prepend .search-query { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.form-search .input-append .search-query { + -webkit-border-radius: 14px 0 0 14px; + -moz-border-radius: 14px 0 0 14px; + border-radius: 14px 0 0 14px; +} +.form-search .input-append .btn { + -webkit-border-radius: 0 14px 14px 0; + -moz-border-radius: 0 14px 14px 0; + border-radius: 0 14px 14px 0; +} +.form-search .input-prepend .search-query { + -webkit-border-radius: 0 14px 14px 0; + -moz-border-radius: 0 14px 14px 0; + border-radius: 0 14px 14px 0; +} +.form-search .input-prepend .btn { + -webkit-border-radius: 14px 0 0 14px; + -moz-border-radius: 14px 0 0 14px; + border-radius: 14px 0 0 14px; } .form-search input, .form-inline input, @@ -1152,6 +1613,7 @@ select:focus:required:invalid:focus { *zoom: 1; margin-bottom: 0; + vertical-align: middle; } .form-search .hide, .form-inline .hide, @@ -1159,7 +1621,9 @@ select:focus:required:invalid:focus { display: none; } .form-search label, -.form-inline label { +.form-inline label, +.form-search .btn-group, +.form-inline .btn-group { display: inline-block; } .form-search .input-append, @@ -1185,45 +1649,53 @@ select:focus:required:invalid:focus { margin-left: 0; } .control-group { - margin-bottom: 9px; + margin-bottom: 10px; } legend + .control-group { - margin-top: 18px; + margin-top: 20px; -webkit-margin-top-collapse: separate; } .form-horizontal .control-group { - margin-bottom: 18px; + margin-bottom: 20px; *zoom: 1; } .form-horizontal .control-group:before, .form-horizontal .control-group:after { display: table; content: ""; + line-height: 0; } .form-horizontal .control-group:after { clear: both; } .form-horizontal .control-label { float: left; - width: 140px; + width: 160px; padding-top: 5px; text-align: right; } .form-horizontal .controls { *display: inline-block; *padding-left: 20px; - margin-left: 160px; + margin-left: 180px; *margin-left: 0; } .form-horizontal .controls:first-child { - *padding-left: 160px; + *padding-left: 180px; } .form-horizontal .help-block { - margin-top: 9px; margin-bottom: 0; } +.form-horizontal input + .help-block, +.form-horizontal select + .help-block, +.form-horizontal textarea + .help-block, +.form-horizontal .uneditable-input + .help-block, +.form-horizontal .input-prepend + .help-block, +.form-horizontal .input-append + .help-block { + margin-top: 10px; +} .form-horizontal .form-actions { - padding-left: 160px; + padding-left: 180px; } table { max-width: 100%; @@ -1233,12 +1705,12 @@ table { } .table { width: 100%; - margin-bottom: 18px; + margin-bottom: 20px; } .table th, .table td { padding: 8px; - line-height: 18px; + line-height: 20px; text-align: left; vertical-align: top; border-top: 1px solid #dddddd; @@ -1260,6 +1732,9 @@ table { .table tbody + tbody { border-top: 2px solid #dddddd; } +.table .table { + background-color: #eeeeee; +} .table-condensed th, .table-condensed td { padding: 4px 5px; @@ -1267,7 +1742,7 @@ table { .table-bordered { border: 1px solid #dddddd; border-collapse: separate; - *border-collapse: collapsed; + *border-collapse: collapse; border-left: 0; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -1288,160 +1763,175 @@ table { .table-bordered tbody:first-child tr:first-child td { border-top: 0; } -.table-bordered thead:first-child tr:first-child th:first-child, -.table-bordered tbody:first-child tr:first-child td:first-child { +.table-bordered thead:first-child tr:first-child > th:first-child, +.table-bordered tbody:first-child tr:first-child > td:first-child, +.table-bordered tbody:first-child tr:first-child > th:first-child { -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; } -.table-bordered thead:first-child tr:first-child th:last-child, -.table-bordered tbody:first-child tr:first-child td:last-child { +.table-bordered thead:first-child tr:first-child > th:last-child, +.table-bordered tbody:first-child tr:first-child > td:last-child, +.table-bordered tbody:first-child tr:first-child > th:last-child { -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; } -.table-bordered thead:last-child tr:last-child th:first-child, -.table-bordered tbody:last-child tr:last-child td:first-child { - -webkit-border-radius: 0 0 0 4px; - -moz-border-radius: 0 0 0 4px; - border-radius: 0 0 0 4px; +.table-bordered thead:last-child tr:last-child > th:first-child, +.table-bordered tbody:last-child tr:last-child > td:first-child, +.table-bordered tbody:last-child tr:last-child > th:first-child, +.table-bordered tfoot:last-child tr:last-child > td:first-child, +.table-bordered tfoot:last-child tr:last-child > th:first-child { -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } -.table-bordered thead:last-child tr:last-child th:last-child, -.table-bordered tbody:last-child tr:last-child td:last-child { +.table-bordered thead:last-child tr:last-child > th:last-child, +.table-bordered tbody:last-child tr:last-child > td:last-child, +.table-bordered tbody:last-child tr:last-child > th:last-child, +.table-bordered tfoot:last-child tr:last-child > td:last-child, +.table-bordered tfoot:last-child tr:last-child > th:last-child { -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; } -.table-striped tbody tr:nth-child(odd) td, -.table-striped tbody tr:nth-child(odd) th { +.table-bordered tfoot + tbody:last-child tr:last-child td:first-child { + -webkit-border-bottom-left-radius: 0; + -moz-border-radius-bottomleft: 0; + border-bottom-left-radius: 0; +} +.table-bordered tfoot + tbody:last-child tr:last-child td:last-child { + -webkit-border-bottom-right-radius: 0; + -moz-border-radius-bottomright: 0; + border-bottom-right-radius: 0; +} +.table-bordered caption + thead tr:first-child th:first-child, +.table-bordered caption + tbody tr:first-child td:first-child, +.table-bordered colgroup + thead tr:first-child th:first-child, +.table-bordered colgroup + tbody tr:first-child td:first-child { + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; +} +.table-bordered caption + thead tr:first-child th:last-child, +.table-bordered caption + tbody tr:first-child td:last-child, +.table-bordered colgroup + thead tr:first-child th:last-child, +.table-bordered colgroup + tbody tr:first-child td:last-child { + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; +} +.table-striped tbody > tr:nth-child(odd) > td, +.table-striped tbody > tr:nth-child(odd) > th { background-color: #f9f9f9; } -.table tbody tr:hover td, -.table tbody tr:hover th { +.table-hover tbody tr:hover > td, +.table-hover tbody tr:hover > th { background-color: #f5f5f5; } -table .span1 { +table td[class*="span"], +table th[class*="span"], +.row-fluid table td[class*="span"], +.row-fluid table th[class*="span"] { + display: table-cell; + float: none; + margin-left: 0; +} +.table td.span1, +.table th.span1 { float: none; width: 44px; margin-left: 0; } -table .span2 { +.table td.span2, +.table th.span2 { float: none; width: 124px; margin-left: 0; } -table .span3 { +.table td.span3, +.table th.span3 { float: none; width: 204px; margin-left: 0; } -table .span4 { +.table td.span4, +.table th.span4 { float: none; width: 284px; margin-left: 0; } -table .span5 { +.table td.span5, +.table th.span5 { float: none; width: 364px; margin-left: 0; } -table .span6 { +.table td.span6, +.table th.span6 { float: none; width: 444px; margin-left: 0; } -table .span7 { +.table td.span7, +.table th.span7 { float: none; width: 524px; margin-left: 0; } -table .span8 { +.table td.span8, +.table th.span8 { float: none; width: 604px; margin-left: 0; } -table .span9 { +.table td.span9, +.table th.span9 { float: none; width: 684px; margin-left: 0; } -table .span10 { +.table td.span10, +.table th.span10 { float: none; width: 764px; margin-left: 0; } -table .span11 { +.table td.span11, +.table th.span11 { float: none; width: 844px; margin-left: 0; } -table .span12 { +.table td.span12, +.table th.span12 { float: none; width: 924px; margin-left: 0; } -table .span13 { - float: none; - width: 1004px; - margin-left: 0; -} -table .span14 { - float: none; - width: 1084px; - margin-left: 0; -} -table .span15 { - float: none; - width: 1164px; - margin-left: 0; -} -table .span16 { - float: none; - width: 1244px; - margin-left: 0; -} -table .span17 { - float: none; - width: 1324px; - margin-left: 0; +.table tbody tr.success > td { + background-color: #dff0d8; } -table .span18 { - float: none; - width: 1404px; - margin-left: 0; +.table tbody tr.error > td { + background-color: #f8f0f0; } -table .span19 { - float: none; - width: 1484px; - margin-left: 0; +.table tbody tr.warning > td { + background-color: #fcf8e3; } -table .span20 { - float: none; - width: 1564px; - margin-left: 0; +.table tbody tr.info > td { + background-color: #d9edf7; } -table .span21 { - float: none; - width: 1644px; - margin-left: 0; +.table-hover tbody tr.success:hover > td { + background-color: #d0e9c6; } -table .span22 { - float: none; - width: 1724px; - margin-left: 0; +.table-hover tbody tr.error:hover > td { + background-color: #f0dfe0; } -table .span23 { - float: none; - width: 1804px; - margin-left: 0; +.table-hover tbody tr.warning:hover > td { + background-color: #faf2cc; } -table .span24 { - float: none; - width: 1884px; - margin-left: 0; +.table-hover tbody tr.info:hover > td { + background-color: #c4e3f3; } .dropup, .dropdown { @@ -1463,18 +1953,11 @@ table .span24 { border-right: 4px solid transparent; border-left: 4px solid transparent; content: ""; - opacity: 0.3; - filter: alpha(opacity=30); } .dropdown .caret { margin-top: 8px; margin-left: 2px; } -.dropdown:hover .caret, -.open .caret { - opacity: 1; - filter: alpha(opacity=100); -} .dropdown-menu { position: absolute; top: 100%; @@ -1483,17 +1966,17 @@ table .span24 { display: none; float: left; min-width: 160px; - padding: 4px 0; - margin: 1px 0 0; + padding: 5px 0; + margin: 2px 0 0; list-style: none; background-color: #ffffff; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); *border-right-width: 2px; *border-bottom-width: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); @@ -1508,35 +1991,71 @@ table .span24 { .dropdown-menu .divider { *width: 100%; height: 1px; - margin: 8px 1px; + margin: 9px 1px; *margin: -5px 0 5px; overflow: hidden; background-color: #e5e5e5; border-bottom: 1px solid #ffffff; } -.dropdown-menu a { +.dropdown-menu > li > a { display: block; - padding: 3px 15px; + padding: 3px 20px; clear: both; font-weight: normal; - line-height: 18px; + line-height: 20px; color: #333333; white-space: nowrap; } -.dropdown-menu li > a:hover, -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { +.dropdown-menu > li > a:hover, +.dropdown-menu > li > a:focus, +.dropdown-submenu:hover > a, +.dropdown-submenu:focus > a { + text-decoration: none; + color: #ffffff; + background-color: #2d9342; + background-image: -moz-linear-gradient(top, #2f9b45, #29873c); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#2f9b45), to(#29873c)); + background-image: -webkit-linear-gradient(top, #2f9b45, #29873c); + background-image: -o-linear-gradient(top, #2f9b45, #29873c); + background-image: linear-gradient(to bottom, #2f9b45, #29873c); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2f9b45', endColorstr='#ff29873c', GradientType=0); +} +.dropdown-menu > .active > a, +.dropdown-menu > .active > a:hover, +.dropdown-menu > .active > a:focus { color: #ffffff; text-decoration: none; - background-color: #045b04; + outline: 0; + background-color: #2d9342; + background-image: -moz-linear-gradient(top, #2f9b45, #29873c); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#2f9b45), to(#29873c)); + background-image: -webkit-linear-gradient(top, #2f9b45, #29873c); + background-image: -o-linear-gradient(top, #2f9b45, #29873c); + background-image: linear-gradient(to bottom, #2f9b45, #29873c); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2f9b45', endColorstr='#ff29873c', GradientType=0); +} +.dropdown-menu > .disabled > a, +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { + color: #999999; +} +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { + text-decoration: none; + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + cursor: default; } .open { *z-index: 1000; } -.open .dropdown-menu { +.open > .dropdown-menu { display: block; } -.pull-right .dropdown-menu { +.pull-right > .dropdown-menu { right: 0; left: auto; } @@ -1544,7 +2063,7 @@ table .span24 { .navbar-fixed-bottom .dropdown .caret { border-top: 0; border-bottom: 4px solid #000000; - content: "\2191"; + content: ""; } .dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { @@ -1552,7 +2071,62 @@ table .span24 { bottom: 100%; margin-bottom: 1px; } +.dropdown-submenu { + position: relative; +} +.dropdown-submenu > .dropdown-menu { + top: 0; + left: 100%; + margin-top: -6px; + margin-left: -1px; + -webkit-border-radius: 0 6px 6px 6px; + -moz-border-radius: 0 6px 6px 6px; + border-radius: 0 6px 6px 6px; +} +.dropdown-submenu:hover > .dropdown-menu { + display: block; +} +.dropup .dropdown-submenu > .dropdown-menu { + top: auto; + bottom: 0; + margin-top: 0; + margin-bottom: -2px; + -webkit-border-radius: 5px 5px 5px 0; + -moz-border-radius: 5px 5px 5px 0; + border-radius: 5px 5px 5px 0; +} +.dropdown-submenu > a:after { + display: block; + content: " "; + float: right; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; + border-width: 5px 0 5px 5px; + border-left-color: #cccccc; + margin-top: 5px; + margin-right: -10px; +} +.dropdown-submenu:hover > a:after { + border-left-color: #ffffff; +} +.dropdown-submenu.pull-left { + float: none; +} +.dropdown-submenu.pull-left > .dropdown-menu { + left: -100%; + margin-left: 10px; + -webkit-border-radius: 6px 0 6px 6px; + -moz-border-radius: 6px 0 6px 6px; + border-radius: 6px 0 6px 6px; +} +.dropdown .dropdown-menu .nav-header { + padding-left: 20px; + padding-right: 20px; +} .typeahead { + z-index: 1051; margin-top: 2px; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -1563,8 +2137,7 @@ table .span24 { padding: 19px; margin-bottom: 20px; background-color: #f5f5f5; - border: 1px solid #eee; - border: 1px solid rgba(0, 0, 0, 0.05); + border: 1px solid #e3e3e3; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -1590,16 +2163,13 @@ table .span24 { } .fade { opacity: 0; - filter: alpha(opacity=0); -webkit-transition: opacity 0.15s linear; -moz-transition: opacity 0.15s linear; - -ms-transition: opacity 0.15s linear; -o-transition: opacity 0.15s linear; transition: opacity 0.15s linear; } .fade.in { opacity: 1; - filter: alpha(opacity=100); } .collapse { position: relative; @@ -1607,7 +2177,6 @@ table .span24 { overflow: hidden; -webkit-transition: height 0.35s ease; -moz-transition: height 0.35s ease; - -ms-transition: height 0.35s ease; -o-transition: height 0.35s ease; transition: height 0.35s ease; } @@ -1618,13 +2187,14 @@ table .span24 { float: right; font-size: 20px; font-weight: bold; - line-height: 18px; + line-height: 20px; color: #000000; text-shadow: 0 1px 0 #ffffff; opacity: 0.2; filter: alpha(opacity=20); } -.close:hover { +.close:hover, +.close:focus { color: #000000; text-decoration: none; cursor: pointer; @@ -1644,25 +2214,23 @@ button.close { /* IE7 inline-block hack */ *zoom: 1; - padding: 4px 10px 4px; + padding: 4px 12px; margin-bottom: 0; - font-size: 13px; - line-height: 18px; - *line-height: 20px; - color: #333333; + font-size: 14px; + line-height: 20px; text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); vertical-align: middle; cursor: pointer; + color: #333333; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); background-color: #f7f7f7; background-image: -moz-linear-gradient(top, #ffffff, #eaeaea); - background-image: -ms-linear-gradient(top, #ffffff, #eaeaea); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#eaeaea)); background-image: -webkit-linear-gradient(top, #ffffff, #eaeaea); background-image: -o-linear-gradient(top, #ffffff, #eaeaea); - background-image: linear-gradient(top, #ffffff, #eaeaea); + background-image: linear-gradient(to bottom, #ffffff, #eaeaea); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#eaeaea', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeaeaea', GradientType=0); border-color: #eaeaea #eaeaea #c4c4c4; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #eaeaea; @@ -1681,10 +2249,12 @@ button.close { box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); } .btn:hover, +.btn:focus, .btn:active, .btn.active, .btn.disabled, .btn[disabled] { + color: #333333; background-color: #eaeaea; *background-color: #dddddd; } @@ -1695,17 +2265,13 @@ button.close { .btn:first-child { *margin-left: 0; } -.btn:hover { +.btn:hover, +.btn:focus { color: #333333; text-decoration: none; - background-color: #e6e6e6; - *background-color: #d9d9d9; - /* Buttons in IE7 don't get borders, so darken on hover */ - background-position: 0 -15px; -webkit-transition: background-position 0.1s linear; -moz-transition: background-position 0.1s linear; - -ms-transition: background-position 0.1s linear; -o-transition: background-position 0.1s linear; transition: background-position 0.1s linear; } @@ -1716,8 +2282,6 @@ button.close { } .btn.active, .btn:active { - background-color: #e6e6e6; - background-color: #d9d9d9 \9; background-image: none; outline: 0; -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); @@ -1727,7 +2291,6 @@ button.close { .btn.disabled, .btn[disabled] { cursor: default; - background-color: #e6e6e6; background-image: none; opacity: 0.65; filter: alpha(opacity=65); @@ -1736,43 +2299,54 @@ button.close { box-shadow: none; } .btn-large { - padding: 9px 14px; - font-size: 15px; - line-height: normal; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; + padding: 11px 19px; + font-size: 17.5px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } -.btn-large [class^="icon-"] { - margin-top: 1px; +.btn-large [class^="icon-"], +.btn-large [class*=" icon-"] { + margin-top: 4px; } .btn-small { - padding: 5px 9px; - font-size: 11px; - line-height: 16px; + padding: 2px 10px; + font-size: 11.9px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.btn-small [class^="icon-"] { +.btn-small [class^="icon-"], +.btn-small [class*=" icon-"] { + margin-top: 0; +} +.btn-mini [class^="icon-"], +.btn-mini [class*=" icon-"] { margin-top: -1px; } .btn-mini { - padding: 2px 6px; - font-size: 11px; - line-height: 14px; + padding: 0 6px; + font-size: 10.5px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.btn-primary, -.btn-primary:hover, -.btn-warning, -.btn-warning:hover, -.btn-danger, -.btn-danger:hover, -.btn-success, -.btn-success:hover, -.btn-info, -.btn-info:hover, -.btn-inverse, -.btn-inverse:hover { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +.btn-block { + display: block; + width: 100%; + padding-left: 0; + padding-right: 0; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.btn-block + .btn-block { + margin-top: 5px; +} +input[type="submit"].btn-block, +input[type="reset"].btn-block, +input[type="button"].btn-block { + width: 100%; } .btn-primary.active, .btn-warning.active, @@ -1782,49 +2356,49 @@ button.close { .btn-inverse.active { color: rgba(255, 255, 255, 0.75); } -.btn { - border-color: #ccc; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} .btn-primary { - background-color: #099f33; - background-image: -moz-linear-gradient(top, #0acf0a, #085871); - background-image: -ms-linear-gradient(top, #0acf0a, #085871); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0acf0a), to(#085871)); - background-image: -webkit-linear-gradient(top, #0acf0a, #085871); - background-image: -o-linear-gradient(top, #0acf0a, #085871); - background-image: linear-gradient(top, #0acf0a, #085871); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #36b24f; + background-image: -moz-linear-gradient(top, #3bc256, #2f9b45); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#3bc256), to(#2f9b45)); + background-image: -webkit-linear-gradient(top, #3bc256, #2f9b45); + background-image: -o-linear-gradient(top, #3bc256, #2f9b45); + background-image: linear-gradient(to bottom, #3bc256, #2f9b45); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0acf0a', endColorstr='#085871', GradientType=0); - border-color: #085871 #085871 #03202a; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3bc256', endColorstr='#ff2f9b45', GradientType=0); + border-color: #2f9b45 #2f9b45 #1d602b; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #085871; + *background-color: #2f9b45; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-primary:hover, +.btn-primary:focus, .btn-primary:active, .btn-primary.active, .btn-primary.disabled, .btn-primary[disabled] { - background-color: #085871; - *background-color: #064559; + color: #ffffff; + background-color: #2f9b45; + *background-color: #29873c; } .btn-primary:active, .btn-primary.active { - background-color: #053341 \9; + background-color: #237434 \9; } .btn-warning { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #faa732; background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-linear-gradient(top, #fbb450, #f89406); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); background-image: -webkit-linear-gradient(top, #fbb450, #f89406); background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(top, #fbb450, #f89406); + background-image: linear-gradient(to bottom, #fbb450, #f89406); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); border-color: #f89406 #f89406 #ad6704; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #f89406; @@ -1833,10 +2407,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-warning:hover, +.btn-warning:focus, .btn-warning:active, .btn-warning.active, .btn-warning.disabled, .btn-warning[disabled] { + color: #ffffff; background-color: #f89406; *background-color: #df8505; } @@ -1845,15 +2421,16 @@ button.close { background-color: #c67605 \9; } .btn-danger { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #da4f49; background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(top, #ee5f5b, #bd362f); + background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0); border-color: #bd362f #bd362f #802420; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #bd362f; @@ -1862,10 +2439,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-danger:hover, +.btn-danger:focus, .btn-danger:active, .btn-danger.active, .btn-danger.disabled, .btn-danger[disabled] { + color: #ffffff; background-color: #bd362f; *background-color: #a9302a; } @@ -1874,15 +2453,16 @@ button.close { background-color: #942a25 \9; } .btn-success { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #5bb75b; background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-linear-gradient(top, #62c462, #51a351); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); background-image: -webkit-linear-gradient(top, #62c462, #51a351); background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(top, #62c462, #51a351); + background-image: linear-gradient(to bottom, #62c462, #51a351); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0); border-color: #51a351 #51a351 #387038; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #51a351; @@ -1891,10 +2471,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-success:hover, +.btn-success:focus, .btn-success:active, .btn-success.active, .btn-success.disabled, .btn-success[disabled] { + color: #ffffff; background-color: #51a351; *background-color: #499249; } @@ -1903,15 +2485,16 @@ button.close { background-color: #408140 \9; } .btn-info { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #49afcd; background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(top, #5bc0de, #2f96b4); + background-image: linear-gradient(to bottom, #5bc0de, #2f96b4); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0); border-color: #2f96b4 #2f96b4 #1f6377; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #2f96b4; @@ -1920,10 +2503,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-info:hover, +.btn-info:focus, .btn-info:active, .btn-info.active, .btn-info.disabled, .btn-info[disabled] { + color: #ffffff; background-color: #2f96b4; *background-color: #2a85a0; } @@ -1932,15 +2517,16 @@ button.close { background-color: #24748c \9; } .btn-inverse { - background-color: #414141; - background-image: -moz-linear-gradient(top, #555555, #222222); - background-image: -ms-linear-gradient(top, #555555, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); - background-image: -webkit-linear-gradient(top, #555555, #222222); - background-image: -o-linear-gradient(top, #555555, #222222); - background-image: linear-gradient(top, #555555, #222222); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #363636; + background-image: -moz-linear-gradient(top, #444444, #222222); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222)); + background-image: -webkit-linear-gradient(top, #444444, #222222); + background-image: -o-linear-gradient(top, #444444, #222222); + background-image: linear-gradient(to bottom, #444444, #222222); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0); border-color: #222222 #222222 #000000; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #222222; @@ -1949,10 +2535,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-inverse:hover, +.btn-inverse:focus, .btn-inverse:active, .btn-inverse.active, .btn-inverse.disabled, .btn-inverse[disabled] { + color: #ffffff; background-color: #222222; *background-color: #151515; } @@ -1962,8 +2550,8 @@ button.close { } button.btn, input[type="submit"].btn { - *padding-top: 2px; - *padding-bottom: 2px; + *padding-top: 3px; + *padding-bottom: 3px; } button.btn::-moz-focus-inner, input[type="submit"].btn::-moz-focus-inner { @@ -1985,19 +2573,46 @@ input[type="submit"].btn.btn-mini { *padding-top: 1px; *padding-bottom: 1px; } +.btn-link, +.btn-link:active, +.btn-link[disabled] { + background-color: transparent; + background-image: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} +.btn-link { + border-color: transparent; + cursor: pointer; + color: #2f9b45; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.btn-link:hover, +.btn-link:focus { + color: #1d602b; + text-decoration: underline; + background-color: transparent; +} +.btn-link[disabled]:hover, +.btn-link[disabled]:focus { + color: #333333; + text-decoration: none; +} .btn-group { position: relative; + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + *zoom: 1; + font-size: 0; + vertical-align: middle; + white-space: nowrap; *margin-left: .3em; } -.btn-group:before, -.btn-group:after { - display: table; - content: ""; -} -.btn-group:after { - clear: both; -} .btn-group:first-child { *margin-left: 0; } @@ -2005,24 +2620,38 @@ input[type="submit"].btn.btn-mini { margin-left: 5px; } .btn-toolbar { - margin-top: 9px; - margin-bottom: 9px; + font-size: 0; + margin-top: 10px; + margin-bottom: 10px; } -.btn-toolbar .btn-group { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; +.btn-toolbar > .btn + .btn, +.btn-toolbar > .btn-group + .btn, +.btn-toolbar > .btn + .btn-group { + margin-left: 5px; } .btn-group > .btn { position: relative; - float: left; - margin-left: -1px; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } +.btn-group > .btn + .btn { + margin-left: -1px; +} +.btn-group > .btn, +.btn-group > .dropdown-menu, +.btn-group > .popover { + font-size: 14px; +} +.btn-group > .btn-mini { + font-size: 10.5px; +} +.btn-group > .btn-small { + font-size: 11.9px; +} +.btn-group > .btn-large { + font-size: 17.5px; +} .btn-group > .btn:first-child { margin-left: 0; -webkit-border-top-left-radius: 4px; @@ -2069,26 +2698,30 @@ input[type="submit"].btn.btn-mini { .btn-group.open .dropdown-toggle { outline: 0; } -.btn-group > .dropdown-toggle { +.btn-group > .btn + .dropdown-toggle { padding-left: 8px; padding-right: 8px; -webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); -moz-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); - *padding-top: 4px; - *padding-bottom: 4px; + *padding-top: 5px; + *padding-bottom: 5px; } -.btn-group > .btn-mini.dropdown-toggle { +.btn-group > .btn-mini + .dropdown-toggle { padding-left: 5px; padding-right: 5px; + *padding-top: 2px; + *padding-bottom: 2px; } -.btn-group > .btn-small.dropdown-toggle { - *padding-top: 4px; +.btn-group > .btn-small + .dropdown-toggle { + *padding-top: 5px; *padding-bottom: 4px; } -.btn-group > .btn-large.dropdown-toggle { +.btn-group > .btn-large + .dropdown-toggle { padding-left: 12px; padding-right: 12px; + *padding-top: 7px; + *padding-bottom: 7px; } .btn-group.open .dropdown-toggle { background-image: none; @@ -2100,7 +2733,7 @@ input[type="submit"].btn.btn-mini { background-color: #eaeaea; } .btn-group.open .btn-primary.dropdown-toggle { - background-color: #085871; + background-color: #2f9b45; } .btn-group.open .btn-warning.dropdown-toggle { background-color: #f89406; @@ -2118,29 +2751,23 @@ input[type="submit"].btn.btn-mini { background-color: #222222; } .btn .caret { - margin-top: 7px; + margin-top: 8px; margin-left: 0; } -.btn:hover .caret, -.open.btn-group .caret { - opacity: 1; - filter: alpha(opacity=100); -} -.btn-mini .caret { - margin-top: 5px; -} -.btn-small .caret { +.btn-large .caret { margin-top: 6px; } .btn-large .caret { - margin-top: 6px; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; } +.btn-mini .caret, +.btn-small .caret { + margin-top: 8px; +} .dropup .btn-large .caret { - border-bottom: 5px solid #000000; - border-top: 0; + border-bottom-width: 5px; } .btn-primary .caret, .btn-warning .caret, @@ -2150,45 +2777,95 @@ input[type="submit"].btn.btn-mini { .btn-inverse .caret { border-top-color: #ffffff; border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +} +.btn-group-vertical { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; +} +.btn-group-vertical > .btn { + display: block; + float: none; + max-width: 100%; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.btn-group-vertical > .btn + .btn { + margin-left: 0; + margin-top: -1px; +} +.btn-group-vertical > .btn:first-child { + -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; +} +.btn-group-vertical > .btn:last-child { + -webkit-border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; + border-radius: 0 0 4px 4px; +} +.btn-group-vertical > .btn-large:first-child { + -webkit-border-radius: 6px 6px 0 0; + -moz-border-radius: 6px 6px 0 0; + border-radius: 6px 6px 0 0; +} +.btn-group-vertical > .btn-large:last-child { + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; } .alert { padding: 8px 35px 8px 14px; - margin-bottom: 18px; + margin-bottom: 20px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); background-color: #fcf8e3; border: 1px solid #fbeed5; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; +} +.alert, +.alert h4 { color: #c09853; } -.alert-heading { - color: inherit; +.alert h4 { + margin: 0; } .alert .close { position: relative; top: -2px; right: -21px; - line-height: 18px; + line-height: 20px; } .alert-success { background-color: #dff0d8; border-color: #d6e9c6; color: #468847; } +.alert-success h4 { + color: #468847; +} .alert-danger, .alert-error { background-color: #f8f0f0; border-color: #c6898b; color: #b55457; } +.alert-danger h4, +.alert-error h4 { + color: #b55457; +} .alert-info { background-color: #d9edf7; border-color: #bce8f1; color: #3a87ad; } +.alert-info h4 { + color: #3a87ad; +} .alert-block { padding-top: 14px; padding-bottom: 14px; @@ -2202,25 +2879,29 @@ input[type="submit"].btn.btn-mini { } .nav { margin-left: 0; - margin-bottom: 18px; + margin-bottom: 20px; list-style: none; } .nav > li > a { display: block; } -.nav > li > a:hover { +.nav > li > a:hover, +.nav > li > a:focus { text-decoration: none; background-color: #eeeeee; } +.nav > li > a > img { + max-width: none; +} .nav > .pull-right { float: right; } -.nav .nav-header { +.nav-header { display: block; padding: 3px 15px; font-size: 11px; font-weight: bold; - line-height: 18px; + line-height: 20px; color: #999999; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); text-transform: uppercase; @@ -2243,18 +2924,20 @@ input[type="submit"].btn.btn-mini { padding: 3px 15px; } .nav-list > .active > a, -.nav-list > .active > a:hover { +.nav-list > .active > a:hover, +.nav-list > .active > a:focus { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #045b04; + background-color: #2f9b45; } -.nav-list [class^="icon-"] { +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { margin-right: 2px; } .nav-list .divider { *width: 100%; height: 1px; - margin: 8px 1px; + margin: 9px 1px; *margin: -5px 0 5px; overflow: hidden; background-color: #e5e5e5; @@ -2270,6 +2953,7 @@ input[type="submit"].btn.btn-mini { .nav-pills:after { display: table; content: ""; + line-height: 0; } .nav-tabs:after, .nav-pills:after { @@ -2295,19 +2979,21 @@ input[type="submit"].btn.btn-mini { .nav-tabs > li > a { padding-top: 8px; padding-bottom: 8px; - line-height: 18px; + line-height: 20px; border: 1px solid transparent; -webkit-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0; } -.nav-tabs > li > a:hover { +.nav-tabs > li > a:hover, +.nav-tabs > li > a:focus { border-color: #eeeeee #eeeeee #dddddd; } .nav-tabs > .active > a, -.nav-tabs > .active > a:hover { +.nav-tabs > .active > a:hover, +.nav-tabs > .active > a:focus { color: #555555; - background-color: #ffffff; + background-color: #eeeeee; border: 1px solid #ddd; border-bottom-color: transparent; cursor: default; @@ -2322,9 +3008,10 @@ input[type="submit"].btn.btn-mini { border-radius: 5px; } .nav-pills > .active > a, -.nav-pills > .active > a:hover { +.nav-pills > .active > a:hover, +.nav-pills > .active > a:focus { color: #ffffff; - background-color: #045b04; + background-color: #2f9b45; } .nav-stacked > li { float: none; @@ -2342,16 +3029,23 @@ input[type="submit"].btn.btn-mini { border-radius: 0; } .nav-tabs.nav-stacked > li:first-child > a { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; } .nav-tabs.nav-stacked > li:last-child > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } -.nav-tabs.nav-stacked > li > a:hover { +.nav-tabs.nav-stacked > li > a:hover, +.nav-tabs.nav-stacked > li > a:focus { border-color: #ddd; z-index: 2; } @@ -2362,51 +3056,60 @@ input[type="submit"].btn.btn-mini { margin-bottom: 1px; } .nav-tabs .dropdown-menu { - -webkit-border-radius: 0 0 5px 5px; - -moz-border-radius: 0 0 5px 5px; - border-radius: 0 0 5px 5px; + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; } .nav-pills .dropdown-menu { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } -.nav-tabs .dropdown-toggle .caret, -.nav-pills .dropdown-toggle .caret { - border-top-color: #045b04; - border-bottom-color: #045b04; +.nav .dropdown-toggle .caret { + border-top-color: #2f9b45; + border-bottom-color: #2f9b45; margin-top: 6px; } -.nav-tabs .dropdown-toggle:hover .caret, -.nav-pills .dropdown-toggle:hover .caret { - border-top-color: #011201; - border-bottom-color: #011201; +.nav .dropdown-toggle:hover .caret, +.nav .dropdown-toggle:focus .caret { + border-top-color: #1d602b; + border-bottom-color: #1d602b; } -.nav-tabs .active .dropdown-toggle .caret, -.nav-pills .active .dropdown-toggle .caret { - border-top-color: #333333; - border-bottom-color: #333333; +/* move down carets for tabs */ +.nav-tabs .dropdown-toggle .caret { + margin-top: 8px; } -.nav > .dropdown.active > a:hover { - color: #000000; +.nav .active .dropdown-toggle .caret { + border-top-color: #fff; + border-bottom-color: #fff; +} +.nav-tabs .active .dropdown-toggle .caret { + border-top-color: #555555; + border-bottom-color: #555555; +} +.nav > .dropdown.active > a:hover, +.nav > .dropdown.active > a:focus { cursor: pointer; } .nav-tabs .open .dropdown-toggle, .nav-pills .open .dropdown-toggle, -.nav > li.dropdown.open.active > a:hover { +.nav > li.dropdown.open.active > a:hover, +.nav > li.dropdown.open.active > a:focus { color: #ffffff; background-color: #999999; border-color: #999999; } .nav li.dropdown.open .caret, .nav li.dropdown.open.active .caret, -.nav li.dropdown.open a:hover .caret { +.nav li.dropdown.open a:hover .caret, +.nav li.dropdown.open a:focus .caret { border-top-color: #ffffff; border-bottom-color: #ffffff; opacity: 1; filter: alpha(opacity=100); } -.tabs-stacked .open > a:hover { +.tabs-stacked .open > a:hover, +.tabs-stacked .open > a:focus { border-color: #999999; } .tabbable { @@ -2416,6 +3119,7 @@ input[type="submit"].btn.btn-mini { .tabbable:after { display: table; content: ""; + line-height: 0; } .tabbable:after { clear: both; @@ -2448,12 +3152,14 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px; } -.tabs-below > .nav-tabs > li > a:hover { +.tabs-below > .nav-tabs > li > a:hover, +.tabs-below > .nav-tabs > li > a:focus { border-bottom-color: transparent; border-top-color: #ddd; } .tabs-below > .nav-tabs > .active > a, -.tabs-below > .nav-tabs > .active > a:hover { +.tabs-below > .nav-tabs > .active > a:hover, +.tabs-below > .nav-tabs > .active > a:focus { border-color: transparent #ddd #ddd #ddd; } .tabs-left > .nav-tabs > li, @@ -2477,11 +3183,13 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px; } -.tabs-left > .nav-tabs > li > a:hover { +.tabs-left > .nav-tabs > li > a:hover, +.tabs-left > .nav-tabs > li > a:focus { border-color: #eeeeee #dddddd #eeeeee #eeeeee; } .tabs-left > .nav-tabs .active > a, -.tabs-left > .nav-tabs .active > a:hover { +.tabs-left > .nav-tabs .active > a:hover, +.tabs-left > .nav-tabs .active > a:focus { border-color: #ddd transparent #ddd #ddd; *border-right-color: #ffffff; } @@ -2496,78 +3204,110 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; } -.tabs-right > .nav-tabs > li > a:hover { +.tabs-right > .nav-tabs > li > a:hover, +.tabs-right > .nav-tabs > li > a:focus { border-color: #eeeeee #eeeeee #eeeeee #dddddd; } .tabs-right > .nav-tabs .active > a, -.tabs-right > .nav-tabs .active > a:hover { +.tabs-right > .nav-tabs .active > a:hover, +.tabs-right > .nav-tabs .active > a:focus { border-color: #ddd #ddd #ddd transparent; *border-left-color: #ffffff; } +.nav > .disabled > a { + color: #999999; +} +.nav > .disabled > a:hover, +.nav > .disabled > a:focus { + text-decoration: none; + background-color: transparent; + cursor: default; +} .navbar { + overflow: visible; + margin-bottom: 20px; *position: relative; *z-index: 2; - overflow: visible; - margin-bottom: 18px; } .navbar-inner { min-height: 40px; padding-left: 20px; padding-right: 20px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); + background-color: #fafafa; + background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2)); + background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2); + background-image: -o-linear-gradient(top, #ffffff, #f2f2f2); + background-image: linear-gradient(to bottom, #ffffff, #f2f2f2); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); + border: 1px solid #d4d4d4; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); - -moz-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); - box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); + *zoom: 1; +} +.navbar-inner:before, +.navbar-inner:after { + display: table; + content: ""; + line-height: 0; +} +.navbar-inner:after { + clear: both; } .navbar .container { width: auto; } .nav-collapse.collapse { height: auto; -} -.navbar { - color: #999999; -} -.navbar .brand:hover { - text-decoration: none; + overflow: visible; } .navbar .brand { float: left; display: block; - padding: 8px 20px 12px; + padding: 10px 20px 10px; margin-left: -20px; font-size: 20px; font-weight: 200; - line-height: 1; - color: #999999; + color: #777777; + text-shadow: 0 1px 0 #ffffff; +} +.navbar .brand:hover, +.navbar .brand:focus { + text-decoration: none; } -.navbar .navbar-text { +.navbar-text { margin-bottom: 0; line-height: 40px; + color: #777777; } -.navbar .navbar-link { - color: #999999; +.navbar-link { + color: #777777; } -.navbar .navbar-link:hover { - color: #ffffff; +.navbar-link:hover, +.navbar-link:focus { + color: #333333; +} +.navbar .divider-vertical { + height: 40px; + margin: 0 9px; + border-left: 1px solid #f2f2f2; + border-right: 1px solid #ffffff; } .navbar .btn, .navbar .btn-group { margin-top: 5px; } -.navbar .btn-group .btn { - margin: 0; +.navbar .btn-group .btn, +.navbar .input-prepend .btn, +.navbar .input-append .btn, +.navbar .input-prepend .btn-group, +.navbar .input-append .btn-group { + margin-top: 0; } .navbar-form { margin-bottom: 0; @@ -2577,6 +3317,7 @@ input[type="submit"].btn.btn-mini { .navbar-form:after { display: table; content: ""; + line-height: 0; } .navbar-form:after { clear: both; @@ -2588,7 +3329,8 @@ input[type="submit"].btn.btn-mini { margin-top: 5px; } .navbar-form input, -.navbar-form select { +.navbar-form select, +.navbar-form .btn { display: inline-block; margin-bottom: 0; } @@ -2599,7 +3341,7 @@ input[type="submit"].btn.btn-mini { } .navbar-form .input-append, .navbar-form .input-prepend { - margin-top: 6px; + margin-top: 5px; white-space: nowrap; } .navbar-form .input-append input, @@ -2609,44 +3351,28 @@ input[type="submit"].btn.btn-mini { .navbar-search { position: relative; float: left; - margin-top: 6px; + margin-top: 5px; margin-bottom: 0; } .navbar-search .search-query { - padding: 4px 9px; + margin-bottom: 0; + padding: 4px 14px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 1; - color: #ffffff; - background-color: #626262; - border: 1px solid #151515; - -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - -webkit-transition: none; - -moz-transition: none; - -ms-transition: none; - -o-transition: none; - transition: none; -} -.navbar-search .search-query:-moz-placeholder { - color: #cccccc; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; } -.navbar-search .search-query::-webkit-input-placeholder { - color: #cccccc; +.navbar-static-top { + position: static; + margin-bottom: 0; } -.navbar-search .search-query:focus, -.navbar-search .search-query.focused { - padding: 5px 10px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - outline: 0; +.navbar-static-top .navbar-inner { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .navbar-fixed-top, .navbar-fixed-bottom { @@ -2657,6 +3383,13 @@ input[type="submit"].btn.btn-mini { margin-bottom: 0; } .navbar-fixed-top .navbar-inner, +.navbar-static-top .navbar-inner { + border-width: 0 0 1px; +} +.navbar-fixed-bottom .navbar-inner { + border-width: 1px 0 0; +} +.navbar-fixed-top .navbar-inner, .navbar-fixed-bottom .navbar-inner { padding-left: 0; padding-right: 0; @@ -2664,6 +3397,7 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0; border-radius: 0; } +.navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 940px; @@ -2671,9 +3405,20 @@ input[type="submit"].btn.btn-mini { .navbar-fixed-top { top: 0; } +.navbar-fixed-top .navbar-inner, +.navbar-static-top .navbar-inner { + -webkit-box-shadow: 0 1px 10px rgba(0,0,0,.1); + -moz-box-shadow: 0 1px 10px rgba(0,0,0,.1); + box-shadow: 0 1px 10px rgba(0,0,0,.1); +} .navbar-fixed-bottom { bottom: 0; } +.navbar-fixed-bottom .navbar-inner { + -webkit-box-shadow: 0 -1px 10px rgba(0,0,0,.1); + -moz-box-shadow: 0 -1px 10px rgba(0,0,0,.1); + box-shadow: 0 -1px 10px rgba(0,0,0,.1); +} .navbar .nav { position: relative; left: 0; @@ -2683,51 +3428,36 @@ input[type="submit"].btn.btn-mini { } .navbar .nav.pull-right { float: right; + margin-right: 0; } .navbar .nav > li { - display: block; float: left; } .navbar .nav > li > a { float: none; - padding: 9px 10px 11px; - line-height: 19px; - color: #999999; + padding: 10px 15px 10px; + color: #777777; text-decoration: none; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.navbar .btn { - display: inline-block; - padding: 4px 10px 4px; - margin: 5px 5px 6px; - line-height: 18px; + text-shadow: 0 1px 0 #ffffff; } -.navbar .btn-group { - margin: 0; - padding: 5px 5px 6px; +.navbar .nav .dropdown-toggle .caret { + margin-top: 8px; } +.navbar .nav > li > a:focus, .navbar .nav > li > a:hover { background-color: transparent; - color: #ffffff; + color: #333333; text-decoration: none; } -.navbar .nav .active > a, -.navbar .nav .active > a:hover { - color: #ffffff; +.navbar .nav > .active > a, +.navbar .nav > .active > a:hover, +.navbar .nav > .active > a:focus { + color: #555555; text-decoration: none; - background-color: #222222; -} -.navbar .divider-vertical { - height: 40px; - width: 1px; - margin: 0 9px; - overflow: hidden; - background-color: #222222; - border-right: 1px solid #333333; -} -.navbar .nav.pull-right { - margin-left: 10px; - margin-right: 0; + background-color: #e5e5e5; + -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); } .navbar .btn-navbar { display: none; @@ -2735,18 +3465,19 @@ input[type="submit"].btn.btn-mini { padding: 7px 10px; margin-left: 5px; margin-right: 5px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #ededed; + background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5)); + background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5); + background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5); + background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - border-color: #222222 #222222 #000000; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); + border-color: #e5e5e5 #e5e5e5 #bfbfbf; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #222222; + *background-color: #e5e5e5; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2755,16 +3486,18 @@ input[type="submit"].btn.btn-mini { box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); } .navbar .btn-navbar:hover, +.navbar .btn-navbar:focus, .navbar .btn-navbar:active, .navbar .btn-navbar.active, .navbar .btn-navbar.disabled, .navbar .btn-navbar[disabled] { - background-color: #222222; - *background-color: #151515; + color: #ffffff; + background-color: #e5e5e5; + *background-color: #d9d9d9; } .navbar .btn-navbar:active, .navbar .btn-navbar.active { - background-color: #080808 \9; + background-color: #cccccc \9; } .navbar .btn-navbar .icon-bar { display: block; @@ -2781,7 +3514,7 @@ input[type="submit"].btn.btn-mini { .btn-navbar .icon-bar + .icon-bar { margin-top: 3px; } -.navbar .dropdown-menu:before { +.navbar .nav > li > .dropdown-menu:before { content: ''; display: inline-block; border-left: 7px solid transparent; @@ -2792,7 +3525,7 @@ input[type="submit"].btn.btn-mini { top: -7px; left: 9px; } -.navbar .dropdown-menu:after { +.navbar .nav > li > .dropdown-menu:after { content: ''; display: inline-block; border-left: 6px solid transparent; @@ -2802,142 +3535,293 @@ input[type="submit"].btn.btn-mini { top: -6px; left: 10px; } -.navbar-fixed-bottom .dropdown-menu:before { +.navbar-fixed-bottom .nav > li > .dropdown-menu:before { border-top: 7px solid #ccc; border-top-color: rgba(0, 0, 0, 0.2); border-bottom: 0; bottom: -7px; top: auto; } -.navbar-fixed-bottom .dropdown-menu:after { +.navbar-fixed-bottom .nav > li > .dropdown-menu:after { border-top: 6px solid #ffffff; border-bottom: 0; bottom: -6px; top: auto; } -.navbar .nav li.dropdown .dropdown-toggle .caret, -.navbar .nav li.dropdown.open .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} -.navbar .nav li.dropdown.active .caret { - opacity: 1; - filter: alpha(opacity=100); +.navbar .nav li.dropdown > a:hover .caret, +.navbar .nav li.dropdown > a:focus .caret { + border-top-color: #333333; + border-bottom-color: #333333; } .navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.open.active > .dropdown-toggle { - background-color: transparent; + background-color: #e5e5e5; + color: #555555; } -.navbar .nav li.dropdown.active > .dropdown-toggle:hover { - color: #ffffff; +.navbar .nav li.dropdown > .dropdown-toggle .caret { + border-top-color: #777777; + border-bottom-color: #777777; +} +.navbar .nav li.dropdown.open > .dropdown-toggle .caret, +.navbar .nav li.dropdown.active > .dropdown-toggle .caret, +.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret { + border-top-color: #555555; + border-bottom-color: #555555; } -.navbar .pull-right .dropdown-menu, -.navbar .dropdown-menu.pull-right { +.navbar .pull-right > li > .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right { left: auto; right: 0; } -.navbar .pull-right .dropdown-menu:before, -.navbar .dropdown-menu.pull-right:before { +.navbar .pull-right > li > .dropdown-menu:before, +.navbar .nav > li > .dropdown-menu.pull-right:before { left: auto; right: 12px; } -.navbar .pull-right .dropdown-menu:after, -.navbar .dropdown-menu.pull-right:after { +.navbar .pull-right > li > .dropdown-menu:after, +.navbar .nav > li > .dropdown-menu.pull-right:after { left: auto; right: 13px; } -.breadcrumb { - padding: 7px 14px; - margin: 0 0 18px; - list-style: none; - background-color: #fbfbfb; - background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5)); - background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); - background-image: linear-gradient(top, #ffffff, #f5f5f5); +.navbar .pull-right > li > .dropdown-menu .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu { + left: auto; + right: 100%; + margin-left: 0; + margin-right: -1px; + -webkit-border-radius: 6px 0 6px 6px; + -moz-border-radius: 6px 0 6px 6px; + border-radius: 6px 0 6px 6px; +} +.navbar-inverse .navbar-inner { + background-color: #1b1b1b; + background-image: -moz-linear-gradient(top, #222222, #111111); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111)); + background-image: -webkit-linear-gradient(top, #222222, #111111); + background-image: -o-linear-gradient(top, #222222, #111111); + background-image: linear-gradient(to bottom, #222222, #111111); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); - border: 1px solid #ddd; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; -} -.breadcrumb li { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - text-shadow: 0 1px 0 #ffffff; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0); + border-color: #252525; } -.breadcrumb .divider { - padding: 0 5px; +.navbar-inverse .brand, +.navbar-inverse .nav > li > a { color: #999999; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } -.breadcrumb .active a { - color: #333333; -} -.pagination { - height: 36px; - margin: 18px 0; +.navbar-inverse .brand:hover, +.navbar-inverse .nav > li > a:hover, +.navbar-inverse .brand:focus, +.navbar-inverse .nav > li > a:focus { + color: #ffffff; } -.pagination ul { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - margin-left: 0; - margin-bottom: 0; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); +.navbar-inverse .brand { + color: #999999; } -.pagination li { - display: inline; +.navbar-inverse .navbar-text { + color: #999999; } -.pagination a { +.navbar-inverse .nav > li > a:focus, +.navbar-inverse .nav > li > a:hover { + background-color: transparent; + color: #ffffff; +} +.navbar-inverse .nav .active > a, +.navbar-inverse .nav .active > a:hover, +.navbar-inverse .nav .active > a:focus { + color: #ffffff; + background-color: #111111; +} +.navbar-inverse .navbar-link { + color: #999999; +} +.navbar-inverse .navbar-link:hover, +.navbar-inverse .navbar-link:focus { + color: #ffffff; +} +.navbar-inverse .divider-vertical { + border-left-color: #111111; + border-right-color: #222222; +} +.navbar-inverse .nav li.dropdown.open > .dropdown-toggle, +.navbar-inverse .nav li.dropdown.active > .dropdown-toggle, +.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle { + background-color: #111111; + color: #ffffff; +} +.navbar-inverse .nav li.dropdown > a:hover .caret, +.navbar-inverse .nav li.dropdown > a:focus .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; +} +.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret { + border-top-color: #999999; + border-bottom-color: #999999; +} +.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, +.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret, +.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; +} +.navbar-inverse .navbar-search .search-query { + color: #ffffff; + background-color: #515151; + border-color: #111111; + -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + -webkit-transition: none; + -moz-transition: none; + -o-transition: none; + transition: none; +} +.navbar-inverse .navbar-search .search-query:-moz-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query:-ms-input-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query:focus, +.navbar-inverse .navbar-search .search-query.focused { + padding: 5px 15px; + color: #333333; + text-shadow: 0 1px 0 #ffffff; + background-color: #ffffff; + border: 0; + -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + outline: 0; +} +.navbar-inverse .btn-navbar { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #0e0e0e; + background-image: -moz-linear-gradient(top, #151515, #040404); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404)); + background-image: -webkit-linear-gradient(top, #151515, #040404); + background-image: -o-linear-gradient(top, #151515, #040404); + background-image: linear-gradient(to bottom, #151515, #040404); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0); + border-color: #040404 #040404 #000000; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + *background-color: #040404; + /* Darken IE7 buttons by default so they stand out more given they won't have borders */ + + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +} +.navbar-inverse .btn-navbar:hover, +.navbar-inverse .btn-navbar:focus, +.navbar-inverse .btn-navbar:active, +.navbar-inverse .btn-navbar.active, +.navbar-inverse .btn-navbar.disabled, +.navbar-inverse .btn-navbar[disabled] { + color: #ffffff; + background-color: #040404; + *background-color: #000000; +} +.navbar-inverse .btn-navbar:active, +.navbar-inverse .btn-navbar.active { + background-color: #000000 \9; +} +.breadcrumb { + padding: 8px 15px; + margin: 0 0 20px; + list-style: none; + background-color: #f5f5f5; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.breadcrumb > li { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + text-shadow: 0 1px 0 #ffffff; +} +.breadcrumb > li > .divider { + padding: 0 5px; + color: #ccc; +} +.breadcrumb > .active { + color: #999999; +} +.pagination { + margin: 20px 0; +} +.pagination ul { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + margin-left: 0; + margin-bottom: 0; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); +} +.pagination ul > li { + display: inline; +} +.pagination ul > li > a, +.pagination ul > li > span { float: left; - padding: 0 14px; - line-height: 34px; + padding: 4px 12px; + line-height: 20px; text-decoration: none; - border: 1px solid #ddd; + background-color: #ffffff; + border: 1px solid #dddddd; border-left-width: 0; } -.pagination a:hover, -.pagination .active a { +.pagination ul > li > a:hover, +.pagination ul > li > a:focus, +.pagination ul > .active > a, +.pagination ul > .active > span { background-color: #f5f5f5; } -.pagination .active a { +.pagination ul > .active > a, +.pagination ul > .active > span { color: #999999; cursor: default; } -.pagination .disabled span, -.pagination .disabled a, -.pagination .disabled a:hover { +.pagination ul > .disabled > span, +.pagination ul > .disabled > a, +.pagination ul > .disabled > a:hover, +.pagination ul > .disabled > a:focus { color: #999999; background-color: transparent; cursor: default; } -.pagination li:first-child a { +.pagination ul > li:first-child > a, +.pagination ul > li:first-child > span { border-left-width: 1px; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } -.pagination li:last-child a { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; +.pagination ul > li:last-child > a, +.pagination ul > li:last-child > span { + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; } .pagination-centered { text-align: center; @@ -2945,9 +3829,63 @@ input[type="submit"].btn.btn-mini { .pagination-right { text-align: right; } +.pagination-large ul > li > a, +.pagination-large ul > li > span { + padding: 11px 19px; + font-size: 17.5px; +} +.pagination-large ul > li:first-child > a, +.pagination-large ul > li:first-child > span { + -webkit-border-top-left-radius: 6px; + -moz-border-radius-topleft: 6px; + border-top-left-radius: 6px; + -webkit-border-bottom-left-radius: 6px; + -moz-border-radius-bottomleft: 6px; + border-bottom-left-radius: 6px; +} +.pagination-large ul > li:last-child > a, +.pagination-large ul > li:last-child > span { + -webkit-border-top-right-radius: 6px; + -moz-border-radius-topright: 6px; + border-top-right-radius: 6px; + -webkit-border-bottom-right-radius: 6px; + -moz-border-radius-bottomright: 6px; + border-bottom-right-radius: 6px; +} +.pagination-mini ul > li:first-child > a, +.pagination-small ul > li:first-child > a, +.pagination-mini ul > li:first-child > span, +.pagination-small ul > li:first-child > span { + -webkit-border-top-left-radius: 3px; + -moz-border-radius-topleft: 3px; + border-top-left-radius: 3px; + -webkit-border-bottom-left-radius: 3px; + -moz-border-radius-bottomleft: 3px; + border-bottom-left-radius: 3px; +} +.pagination-mini ul > li:last-child > a, +.pagination-small ul > li:last-child > a, +.pagination-mini ul > li:last-child > span, +.pagination-small ul > li:last-child > span { + -webkit-border-top-right-radius: 3px; + -moz-border-radius-topright: 3px; + border-top-right-radius: 3px; + -webkit-border-bottom-right-radius: 3px; + -moz-border-radius-bottomright: 3px; + border-bottom-right-radius: 3px; +} +.pagination-small ul > li > a, +.pagination-small ul > li > span { + padding: 2px 10px; + font-size: 11.9px; +} +.pagination-mini ul > li > a, +.pagination-mini ul > li > span { + padding: 0 6px; + font-size: 10.5px; +} .pager { - margin-left: 0; - margin-bottom: 18px; + margin: 20px 0; list-style: none; text-align: center; *zoom: 1; @@ -2956,6 +3894,7 @@ input[type="submit"].btn.btn-mini { .pager:after { display: table; content: ""; + line-height: 0; } .pager:after { clear: both; @@ -2963,7 +3902,8 @@ input[type="submit"].btn.btn-mini { .pager li { display: inline; } -.pager a { +.pager li > a, +.pager li > span { display: inline-block; padding: 5px 14px; background-color: #fff; @@ -2972,34 +3912,27 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 15px; border-radius: 15px; } -.pager a:hover { +.pager li > a:hover, +.pager li > a:focus { text-decoration: none; background-color: #f5f5f5; } -.pager .next a { +.pager .next > a, +.pager .next > span { float: right; } -.pager .previous a { +.pager .previous > a, +.pager .previous > span { float: left; } -.pager .disabled a, -.pager .disabled a:hover { +.pager .disabled > a, +.pager .disabled > a:hover, +.pager .disabled > a:focus, +.pager .disabled > span { color: #999999; background-color: #fff; cursor: default; } -.modal-open .dropdown-menu { - z-index: 2050; -} -.modal-open .dropdown.open { - *z-index: 2050; -} -.modal-open .popover { - z-index: 2060; -} -.modal-open .tooltip { - z-index: 2070; -} .modal-backdrop { position: fixed; top: 0; @@ -3019,12 +3952,11 @@ input[type="submit"].btn.btn-mini { } .modal { position: fixed; - top: 50%; + top: 10%; left: 50%; z-index: 1050; - overflow: auto; width: 560px; - margin: -250px 0 0 -280px; + margin-left: -280px; background-color: #ffffff; border: 1px solid #999; border: 1px solid rgba(0, 0, 0, 0.3); @@ -3040,17 +3972,17 @@ input[type="submit"].btn.btn-mini { -webkit-background-clip: padding-box; -moz-background-clip: padding-box; background-clip: padding-box; + outline: none; } .modal.fade { -webkit-transition: opacity .3s linear, top .3s ease-out; -moz-transition: opacity .3s linear, top .3s ease-out; - -ms-transition: opacity .3s linear, top .3s ease-out; -o-transition: opacity .3s linear, top .3s ease-out; transition: opacity .3s linear, top .3s ease-out; top: -25%; } .modal.fade.in { - top: 50%; + top: 10%; } .modal-header { padding: 9px 15px; @@ -3059,7 +3991,12 @@ input[type="submit"].btn.btn-mini { .modal-header .close { margin-top: 2px; } +.modal-header h3 { + margin: 0; + line-height: 30px; +} .modal-body { + position: relative; overflow-y: auto; max-height: 400px; padding: 15px; @@ -3085,6 +4022,7 @@ input[type="submit"].btn.btn-mini { .modal-footer:after { display: table; content: ""; + line-height: 0; } .modal-footer:after { clear: both; @@ -3096,13 +4034,16 @@ input[type="submit"].btn.btn-mini { .modal-footer .btn-group .btn + .btn { margin-left: -1px; } +.modal-footer .btn-block + .btn-block { + margin-left: 0; +} .tooltip { position: absolute; - z-index: 1020; + z-index: 1030; display: block; visibility: visible; - padding: 5px; font-size: 11px; + line-height: 1.4; opacity: 0; filter: alpha(opacity=0); } @@ -3111,52 +4052,24 @@ input[type="submit"].btn.btn-mini { filter: alpha(opacity=80); } .tooltip.top { - margin-top: -2px; + margin-top: -3px; + padding: 5px 0; } .tooltip.right { - margin-left: 2px; + margin-left: 3px; + padding: 0 5px; } .tooltip.bottom { - margin-top: 2px; + margin-top: 3px; + padding: 5px 0; } .tooltip.left { - margin-left: -2px; -} -.tooltip.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; -} -.tooltip.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.tooltip.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; -} -.tooltip.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; + margin-left: -3px; + padding: 0 5px; } .tooltip-inner { max-width: 200px; - padding: 3px 8px; + padding: 8px; color: #ffffff; text-align: center; text-decoration: none; @@ -3169,100 +4082,36 @@ input[type="submit"].btn.btn-mini { position: absolute; width: 0; height: 0; + border-color: transparent; + border-style: solid; } -.popover { - position: absolute; - top: 0; - left: 0; - z-index: 1010; - display: none; - padding: 5px; -} -.popover.top { - margin-top: -5px; -} -.popover.right { - margin-left: 5px; -} -.popover.bottom { - margin-top: 5px; -} -.popover.left { - margin-left: -5px; -} -.popover.top .arrow { +.tooltip.top .tooltip-arrow { bottom: 0; left: 50%; margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; + border-width: 5px 5px 0; + border-top-color: #000000; } -.popover.right .arrow { +.tooltip.right .tooltip-arrow { top: 50%; left: 0; margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; -} -.popover.bottom .arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; + border-width: 5px 5px 5px 0; + border-right-color: #000000; } -.popover.left .arrow { +.tooltip.left .tooltip-arrow { top: 50%; right: 0; margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.popover .arrow { - position: absolute; - width: 0; - height: 0; -} -.popover-inner { - padding: 3px; - width: 280px; - overflow: hidden; - background: #000000; - background: rgba(0, 0, 0, 0.8); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -} -.popover-title { - padding: 9px 15px; - line-height: 1; - background-color: #f5f5f5; - border-bottom: 1px solid #eee; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; -} -.popover-content { - padding: 14px; - background-color: #ffffff; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; + border-width: 5px 0 5px 5px; + border-left-color: #000000; } -.popover-content p, -.popover-content ul, -.popover-content ol { - margin-bottom: 0; +.tooltip.bottom .tooltip-arrow { + top: 0; + left: 50%; + margin-left: -5px; + border-width: 0 5px 5px; + border-bottom-color: #000000; } .thumbnails { margin-left: -20px; @@ -3273,6 +4122,7 @@ input[type="submit"].btn.btn-mini { .thumbnails:after { display: table; content: ""; + line-height: 0; } .thumbnails:after { clear: both; @@ -3282,23 +4132,28 @@ input[type="submit"].btn.btn-mini { } .thumbnails > li { float: left; - margin-bottom: 18px; + margin-bottom: 20px; margin-left: 20px; } .thumbnail { display: block; padding: 4px; - line-height: 1; + line-height: 20px; border: 1px solid #ddd; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); -} -a.thumbnail:hover { - border-color: #045b04; + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +a.thumbnail:hover, +a.thumbnail:focus { + border-color: #2f9b45; -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); @@ -3311,10 +4166,13 @@ a.thumbnail:hover { } .thumbnail .caption { padding: 9px; + color: #555555; } .label, .badge { - font-size: 10.998px; + display: inline-block; + padding: 2px 4px; + font-size: 11.844px; font-weight: bold; line-height: 14px; color: #ffffff; @@ -3324,19 +4182,25 @@ a.thumbnail:hover { background-color: #999999; } .label { - padding: 1px 4px 2px; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } .badge { - padding: 1px 9px 2px; + padding-left: 9px; + padding-right: 9px; -webkit-border-radius: 9px; -moz-border-radius: 9px; border-radius: 9px; } +.label:empty, +.badge:empty { + display: none; +} a.label:hover, -a.badge:hover { +a.label:focus, +a.badge:hover, +a.badge:focus { color: #ffffff; text-decoration: none; cursor: pointer; @@ -3381,9 +4245,18 @@ a.badge:hover { .badge-inverse[href] { background-color: #1a1a1a; } -@-webkit-keyframes progress-bar-stripes { - from { - background-position: 40px 0; +.btn .label, +.btn .badge { + position: relative; + top: -1px; +} +.btn-mini .label, +.btn-mini .badge { + top: 0; +} +@-webkit-keyframes progress-bar-stripes { + from { + background-position: 40px 0; } to { background-position: 0 0; @@ -3423,17 +4296,16 @@ a.badge:hover { } .progress { overflow: hidden; - height: 18px; - margin-bottom: 18px; + height: 20px; + margin-bottom: 20px; background-color: #f7f7f7; background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0); -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); @@ -3443,41 +4315,43 @@ a.badge:hover { } .progress .bar { width: 0%; - height: 18px; + height: 100%; color: #ffffff; + float: left; font-size: 12px; text-align: center; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #0e90d2; background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -ms-linear-gradient(top, #149bdf, #0480be); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); background-image: -webkit-linear-gradient(top, #149bdf, #0480be); background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(top, #149bdf, #0480be); + background-image: linear-gradient(to bottom, #149bdf, #0480be); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; -webkit-transition: width 0.6s ease; -moz-transition: width 0.6s ease; - -ms-transition: width 0.6s ease; -o-transition: width 0.6s ease; transition: width 0.6s ease; } +.progress .bar + .bar { + -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); + -moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); + box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); +} .progress-striped .bar { background-color: #149bdf; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -webkit-background-size: 40px 40px; -moz-background-size: 40px 40px; -o-background-size: 40px 40px; @@ -3490,88 +4364,88 @@ a.badge:hover { -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; } -.progress-danger .bar { +.progress-danger .bar, +.progress .bar-danger { background-color: #dd514c; background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(top, #ee5f5b, #c43c35); + background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0); } -.progress-danger.progress-striped .bar { +.progress-danger.progress-striped .bar, +.progress-striped .bar-danger { background-color: #ee5f5b; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-success .bar { +.progress-success .bar, +.progress .bar-success { background-color: #5eb95e; background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); background-image: -webkit-linear-gradient(top, #62c462, #57a957); background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); + background-image: linear-gradient(to bottom, #62c462, #57a957); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0); } -.progress-success.progress-striped .bar { +.progress-success.progress-striped .bar, +.progress-striped .bar-success { background-color: #62c462; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-info .bar { +.progress-info .bar, +.progress .bar-info { background-color: #4bb1cf; background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(top, #5bc0de, #339bb9); + background-image: linear-gradient(to bottom, #5bc0de, #339bb9); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0); } -.progress-info.progress-striped .bar { +.progress-info.progress-striped .bar, +.progress-striped .bar-info { background-color: #5bc0de; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-warning .bar { +.progress-warning .bar, +.progress .bar-warning { background-color: #faa732; background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-linear-gradient(top, #fbb450, #f89406); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); background-image: -webkit-linear-gradient(top, #fbb450, #f89406); background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(top, #fbb450, #f89406); + background-image: linear-gradient(to bottom, #fbb450, #f89406); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); } -.progress-warning.progress-striped .bar { +.progress-warning.progress-striped .bar, +.progress-striped .bar-warning { background-color: #fbb450; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .accordion { - margin-bottom: 18px; + margin-bottom: 20px; } .accordion-group { margin-bottom: 2px; @@ -3596,7 +4470,7 @@ a.badge:hover { } .carousel { position: relative; - margin-bottom: 18px; + margin-bottom: 20px; line-height: 1; } .carousel-inner { @@ -3604,47 +4478,47 @@ a.badge:hover { width: 100%; position: relative; } -.carousel .item { +.carousel-inner > .item { display: none; position: relative; -webkit-transition: 0.6s ease-in-out left; -moz-transition: 0.6s ease-in-out left; - -ms-transition: 0.6s ease-in-out left; -o-transition: 0.6s ease-in-out left; transition: 0.6s ease-in-out left; } -.carousel .item > img { +.carousel-inner > .item > img, +.carousel-inner > .item > a > img { display: block; line-height: 1; } -.carousel .active, -.carousel .next, -.carousel .prev { +.carousel-inner > .active, +.carousel-inner > .next, +.carousel-inner > .prev { display: block; } -.carousel .active { +.carousel-inner > .active { left: 0; } -.carousel .next, -.carousel .prev { +.carousel-inner > .next, +.carousel-inner > .prev { position: absolute; top: 0; width: 100%; } -.carousel .next { +.carousel-inner > .next { left: 100%; } -.carousel .prev { +.carousel-inner > .prev { left: -100%; } -.carousel .next.left, -.carousel .prev.right { +.carousel-inner > .next.left, +.carousel-inner > .prev.right { left: 0; } -.carousel .active.left { +.carousel-inner > .active.left { left: -100%; } -.carousel .active.right { +.carousel-inner > .active.right { left: 100%; } .carousel-control { @@ -3671,28 +4545,62 @@ a.badge:hover { left: auto; right: 15px; } -.carousel-control:hover { +.carousel-control:hover, +.carousel-control:focus { color: #ffffff; text-decoration: none; opacity: 0.9; filter: alpha(opacity=90); } +.carousel-indicators { + position: absolute; + top: 15px; + right: 15px; + z-index: 5; + margin: 0; + list-style: none; +} +.carousel-indicators li { + display: block; + float: left; + width: 10px; + height: 10px; + margin-left: 5px; + text-indent: -999px; + background-color: #ccc; + background-color: rgba(255, 255, 255, 0.25); + border-radius: 5px; +} +.carousel-indicators .active { + background-color: #fff; +} .carousel-caption { position: absolute; left: 0; right: 0; bottom: 0; - padding: 10px 15px 5px; + padding: 15px; background: #333333; background: rgba(0, 0, 0, 0.75); } .carousel-caption h4, .carousel-caption p { color: #ffffff; + line-height: 20px; +} +.carousel-caption h4 { + margin: 0 0 5px; +} +.carousel-caption p { + margin-bottom: 0; } .hero-unit { padding: 60px; margin-bottom: 30px; + font-size: 18px; + font-weight: 200; + line-height: 30px; + color: inherit; background-color: #eeeeee; -webkit-border-radius: 6px; -moz-border-radius: 6px; @@ -3705,1500 +4613,2030 @@ a.badge:hover { color: inherit; letter-spacing: -1px; } -.hero-unit p { - font-size: 18px; - font-weight: 200; - line-height: 27px; - color: inherit; -} -.pull-right { - float: right; -} -.pull-left { - float: left; +.hero-unit li { + line-height: 30px; } -.hide { +.popover { + position: absolute; + top: 0; + left: 0; + z-index: 1010; display: none; + max-width: 276px; + padding: 1px; + text-align: left; + background-color: #ffffff; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + white-space: normal; } -.show { - display: block; +.popover.top { + margin-top: -10px; } -.invisible { - visibility: hidden; +.popover.right { + margin-left: 10px; } -/* Font Awesome - the iconic font designed for use with Twitter Bootstrap - ------------------------------------------------------- - The full suite of pictographic icons, examples, and documentation - can be found at: http://fortawesome.github.com/Font-Awesome/ - - License - ------------------------------------------------------- - The Font Awesome webfont, CSS, and LESS files are licensed under CC BY 3.0: - http://creativecommons.org/licenses/by/3.0/ A mention of - 'Font Awesome - http://fortawesome.github.com/Font-Awesome' in human-readable - source code is considered acceptable attribution (most common on the web). - If human readable source code is not available to the end user, a mention in - an 'About' or 'Credits' screen is considered acceptable (most common in desktop - or mobile software). - - Contact - ------------------------------------------------------- - Email: dave@davegandy.com - Twitter: http://twitter.com/fortaweso_me - Work: Lead Product Designer @ http://kyruus.com - - */ -@font-face { - font-family: 'FontAwesome'; - src: url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.eot'); - src: url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.woff') format('woff'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.ttf') format('truetype'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.svg#FontAwesome') format('svg'); - font-weight: normal; - font-style: normal; +.popover.bottom { + margin-top: 10px; } -/* Font Awesome styles - ------------------------------------------------------- */ -[class^="icon-"]:before, -[class*=" icon-"]:before { - font-family: FontAwesome; +.popover.left { + margin-left: -10px; +} +.popover-title { + margin: 0; + padding: 8px 14px; + font-size: 14px; font-weight: normal; - font-style: normal; - display: inline-block; - text-decoration: inherit; + line-height: 18px; + background-color: #f7f7f7; + border-bottom: 1px solid #ebebeb; + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; } -a [class^="icon-"], -a [class*=" icon-"] { - display: inline-block; - text-decoration: inherit; +.popover-title:empty { + display: none; } -/* makes the font 33% larger relative to the icon container */ -.icon-large:before { - vertical-align: middle; - font-size: 1.3333333333333333em; +.popover-content { + padding: 9px 14px; } -.btn [class^="icon-"], -.nav-tabs [class^="icon-"], -.btn [class*=" icon-"], -.nav-tabs [class*=" icon-"] { - /* keeps button heights with and without icons the same */ - - line-height: .9em; +.popover .arrow, +.popover .arrow:after { + position: absolute; + display: block; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; } -li [class^="icon-"], -li [class*=" icon-"] { - display: inline-block; - width: 1.25em; - text-align: center; +.popover .arrow { + border-width: 11px; } -li .icon-large:before, -li .icon-large:before { - /* 1.5 increased font size for icon-large * 1.25 width */ - - width: 1.875em; +.popover .arrow:after { + border-width: 10px; + content: ""; } -ul.icons { - list-style-type: none; - margin-left: 2em; - text-indent: -0.8em; +.popover.top .arrow { + left: 50%; + margin-left: -11px; + border-bottom-width: 0; + border-top-color: #999; + border-top-color: rgba(0, 0, 0, 0.25); + bottom: -11px; +} +.popover.top .arrow:after { + bottom: 1px; + margin-left: -10px; + border-bottom-width: 0; + border-top-color: #ffffff; } -ul.icons li [class^="icon-"], -ul.icons li [class*=" icon-"] { - width: .8em; +.popover.right .arrow { + top: 50%; + left: -11px; + margin-top: -11px; + border-left-width: 0; + border-right-color: #999; + border-right-color: rgba(0, 0, 0, 0.25); } -ul.icons li .icon-large:before, -ul.icons li .icon-large:before { - /* 1.5 increased font size for icon-large * 1.25 width */ - - vertical-align: initial; +.popover.right .arrow:after { + left: 1px; + bottom: -10px; + border-left-width: 0; + border-right-color: #ffffff; } -/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen - readers do not read off random characters that represent icons */ -.icon-glass:before { - content: "\f000"; +.popover.bottom .arrow { + left: 50%; + margin-left: -11px; + border-top-width: 0; + border-bottom-color: #999; + border-bottom-color: rgba(0, 0, 0, 0.25); + top: -11px; } -.icon-music:before { - content: "\f001"; +.popover.bottom .arrow:after { + top: 1px; + margin-left: -10px; + border-top-width: 0; + border-bottom-color: #ffffff; } -.icon-search:before { - content: "\f002"; +.popover.left .arrow { + top: 50%; + right: -11px; + margin-top: -11px; + border-right-width: 0; + border-left-color: #999; + border-left-color: rgba(0, 0, 0, 0.25); } -.icon-envelope:before { - content: "\f003"; +.popover.left .arrow:after { + right: 1px; + border-right-width: 0; + border-left-color: #ffffff; + bottom: -10px; } -.icon-heart:before { - content: "\f004"; +.pull-right { + float: right; } -.icon-star:before { - content: "\f005"; +.pull-left { + float: left; } -.icon-star-empty:before { - content: "\f006"; +.hide { + display: none; } -.icon-user:before { - content: "\f007"; +.show { + display: block; } -.icon-film:before { - content: "\f008"; +.invisible { + visibility: hidden; } -.icon-th-large:before { - content: "\f009"; +.affix { + position: fixed; } -.icon-th:before { - content: "\f00a"; +.tag { + display: inline-block; + margin-bottom: 4px; + color: #111111; + background-color: #f6f6f6; + padding: 1px 10px; + border: 1px solid #dddddd; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; + -webkit-box-shadow: inset 0 1px 0 #ffffff; + -moz-box-shadow: inset 0 1px 0 #ffffff; + box-shadow: inset 0 1px 0 #ffffff; } -.icon-th-list:before { - content: "\f00b"; +a.tag:hover { + text-decoration: none; + color: #fff; + background-color: #3bc256; + border: 1px solid #2f9b45; + -webkit-box-shadow: inset 0 1px 0 #61cf77; + -moz-box-shadow: inset 0 1px 0 #61cf77; + box-shadow: inset 0 1px 0 #61cf77; } -.icon-ok:before { - content: "\f00c"; +.pill { + display: inline-block; + background-color: #6f8890; + color: #ffffff; + padding: 2px 10px 1px 10px; + margin-right: 5px; + font-weight: normal; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; } -.icon-remove:before { - content: "\f00d"; +.pill a { + color: #ffffff; } -.icon-zoom-in:before { - content: "\f00e"; +.pill a.remove { + font-size: 11px; } -.icon-zoom-out:before { - content: "\f010"; +.unstyled { + margin: 0; + list-style: none; } -.icon-off:before { - content: "\f011"; +.simple-item { + font-size: 12px; + line-height: 1.1666666666666667em; + padding: 7px 25px; + border-bottom: 1px dotted #dddddd; } -.icon-signal:before { - content: "\f012"; +.simple-item:last-of-type { + border-bottom: 0; } -.icon-cog:before { - content: "\f013"; +.simple-list { + *zoom: 1; + margin: 0; + list-style: none; } -.icon-trash:before { - content: "\f014"; +.simple-list:before, +.simple-list:after { + display: table; + content: ""; + line-height: 0; } -.icon-home:before { - content: "\f015"; +.simple-list:after { + clear: both; } -.icon-file:before { - content: "\f016"; +.simple-list > li { + font-size: 12px; + line-height: 1.1666666666666667em; + padding: 7px 25px; + border-bottom: 1px dotted #dddddd; } -.icon-time:before { - content: "\f017"; +.simple-list > li:last-of-type { + border-bottom: 0; } -.icon-road:before { - content: "\f018"; +.simple-list .ckan-icon { + position: relative; + top: 0px; } -.icon-download-alt:before { - content: "\f019"; +.module-narrow .simple-list > li { + padding-left: 15px; + padding-right: 15px; + position: relative; } -.icon-download:before { - content: "\f01a"; +.listing li { + text-align: right; + margin-bottom: 5px; } -.icon-upload:before { - content: "\f01b"; +.listing .key { + clear: right; + font-weight: bold; } -.icon-inbox:before { - content: "\f01c"; +.js .tab-content { + display: none; } -.icon-play-circle:before { - content: "\f01d"; +.js .tab-content.active { + display: block; } -.icon-repeat:before { - content: "\f01e"; +.box { + background-color: #FFF; + border: 1px solid #cccccc; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); } -/* \f020 doesn't work in Safari. all shifted one down */ -.icon-refresh:before { - content: "\f021"; +.module { + margin: 20px 0; } -.icon-list-alt:before { - content: "\f022"; +.module-heading { + *zoom: 1; + margin: 0; + padding: 7px 25px; + font-size: 14px; + line-height: 1.3; + background-color: #f6f6f6; + border-top: 1px solid #dddddd; + border-bottom: 1px solid #dddddd; } -.icon-lock:before { - content: "\f023"; +.module-heading:before, +.module-heading:after { + display: table; + content: ""; + line-height: 0; } -.icon-flag:before { - content: "\f024"; +.module-heading:after { + clear: both; } -.icon-headphones:before { - content: "\f025"; +.module-heading .action { + float: right; + color: #888888; + font-size: 12px; + line-height: 20px; + text-decoration: underline; } -.icon-volume-off:before { - content: "\f026"; +.module-heading .action:hover { + color: #444444; } -.icon-volume-down:before { - content: "\f027"; +.module-content { + padding: 0 25px; + margin: 20px 0; } -.icon-volume-up:before { - content: "\f028"; +.module-content:first-child { + margin-top: 0; + padding-top: 20px; } -.icon-qrcode:before { - content: "\f029"; +.module-content:last-child { + margin-bottom: 0; + padding-bottom: 20px; } -.icon-barcode:before { - content: "\f02a"; +.module-content > :last-child { + margin-bottom: 0; } -.icon-tag:before { - content: "\f02b"; +.module:first-child .module-heading { + -webkit-border-radius: 3px 0 0 0; + -moz-border-radius: 3px 0 0 0; + border-radius: 3px 0 0 0; + border-top-width: 0; } -.icon-tags:before { - content: "\f02c"; +.module:last-child { + margin-bottom: 20px; } -.icon-book:before { - content: "\f02d"; +.module-footer { + padding: 7px 25px 7px; + margin: 0; + border-top: 1px dotted #dddddd; } -.icon-bookmark:before { - content: "\f02e"; +.module .read-more { + font-weight: bold; + color: #000000; } -.icon-print:before { - content: "\f02f"; +.module .pagination { + height: 34px; + margin-bottom: 0; + border-top: 1px solid #dddddd; } -.icon-camera:before { - content: "\f030"; +.module-content .pagination { + margin-left: -25px; + margin-right: -25px; + margin-bottom: -20px; } -.icon-font:before { - content: "\f031"; +.module .pagination > ul { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + border: 0; } -.icon-bold:before { - content: "\f032"; +.module .pagination li a { + border-top: none; + border-bottom: none; + padding-top: 7px; + padding-bottom: 7px; } -.icon-italic:before { - content: "\f033"; +.module .pagination li:first-child a, +.module .pagination li:last-child a { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } -.icon-text-height:before { - content: "\f034"; +.module .pagination li:first-child a { + border-left-width: 0; } -.icon-text-width:before { - content: "\f035"; +.module .pagination li:last-child a { + border-right-width: 0; } -.icon-align-left:before { - content: "\f036"; +.module .pagination li.active a { + border-left-width: 1px; + border-right-width: 1px; } -.icon-align-center:before { - content: "\f037"; +.module-content-shallow { + padding: 0; + margin-top: 10px; + padding-bottom: 10px; } -.icon-align-right:before { - content: "\f038"; +.module h1 { + margin-bottom: 20px; } -.icon-align-justify:before { - content: "\f039"; +.module-shallow .module-content { + padding: 10px; + margin: 0; } -.icon-list:before { - content: "\f03a"; +.module-shallow .module-tags { + margin-top: 0; + margin-bottom: 0; } -.icon-indent-left:before { - content: "\f03b"; +.module-shallow .module-content:first-child { + padding-top: 10px; } -.icon-indent-right:before { - content: "\f03c"; +.module-shallow .module-content:last-child { + padding-bottom: 10px; } -.icon-facetime-video:before { - content: "\f03d"; +.module-narrow .module-heading, +.module-narrow .module-content, +.module-narrow .module-footer { + padding-left: 15px; + padding-right: 15px; } -.icon-picture:before { - content: "\f03e"; +.module-grid { + margin: 0; + list-style: none; + *zoom: 1; + margin: 0 -25px; + padding-bottom: 15px; + background: #fbfbfb url("../../../base/images/bg.png"); + border: 1px solid #dddddd; + border-width: 1px 0; } -.icon-pencil:before { - content: "\f040"; +.module-grid:before, +.module-grid:after { + display: table; + content: ""; + line-height: 0; } -.icon-map-marker:before { - content: "\f041"; +.module-grid:after { + clear: both; } -.icon-adjust:before { - content: "\f042"; +.module-item { + width: 189px; + padding: 15px; + margin: 15px 0 0 15px; + background-color: white; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + float: left; + margin-left: 20px; + width: 460px; + padding-top: 10px; + padding-bottom: 10px; + padding-right: 50px; + overflow: hidden; + position: relative; } -.icon-tint:before { - content: "\f043"; +.module-item span.count { + color: #999; } -.icon-edit:before { - content: "\f044"; +.module-item .media-image { + margin-bottom: 5px; } -.icon-share:before { - content: "\f045"; +.module-item .media-edit { + opacity: 0; + position: absolute; + right: 15px; + bottom: 15px; + -webkit-transition: opacity 0.2s ease-in; + -moz-transition: opacity 0.2s ease-in; + -o-transition: opacity 0.2s ease-in; + transition: opacity 0.2s ease-in; } -.icon-check:before { - content: "\f046"; +.module-item:hover { + z-index: 1; } -.icon-move:before { - content: "\f047"; +.module-item:hover .media-edit { + opacity: 1; } -.icon-step-backward:before { - content: "\f048"; +.module-item.first { + clear: left; } -.icon-fast-backward:before { - content: "\f049"; +.group .content img { + margin: 0 -5px 5px; + max-width: initial; } -.icon-backward:before { - content: "\f04a"; +.group .content h3 { + font-size: 14px; + line-height: 1.3; } -.icon-play:before { - content: "\f04b"; +.group-listing { + margin-left: -20px; } -.icon-pause:before { - content: "\f04c"; +.ckanext-datapreview { + position: relative; } -.icon-stop:before { - content: "\f04d"; +.ckanext-datapreview > iframe { + min-height: 400px; } -.icon-forward:before { - content: "\f04e"; +.ckanext-datapreview > img { + max-height: 500px; + max-width: 100%; + overflow: hidden; } -.icon-fast-forward:before { - content: "\f050"; +.package-info h4 { + margin-bottom: 10px; } -.icon-step-forward:before { - content: "\f051"; +.module-resource { + background-color: #ffffff; + border-bottom: 1px solid #dddddd; + margin-top: 0; + margin-bottom: 0; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } -.icon-eject:before { - content: "\f052"; +.module-resource .actions { + position: relative; + float: right; + top: -10px; + right: -15px; } -.icon-chevron-left:before { - content: "\f053"; +.module .module-tags { + padding-bottom: 8px; } -.icon-chevron-right:before { - content: "\f054"; +.secondary .module:first-child, +.primary .module:first-child { + margin-top: 0; } -.icon-plus-sign:before { - content: "\f055"; +.no-nav .module:last-child { + margin-top: 0; } -.icon-minus-sign:before { - content: "\f056"; +.module-image { + float: left; + width: 50px; + height: 50px; + line-height: 50px; + text-align: center; + margin-right: 15px; } -.icon-remove-sign:before { - content: "\f057"; +.module-image img { + max-width: 50px; + max-height: 50px; + vertical-align: middle; } -.icon-ok-sign:before { - content: "\f058"; +.banner { + -webkit-transform: rotate(45deg); + -moz-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); + -webkit-transform-origin: center center; + -moz-transform-origin: center center; + -ms-transform-origin: center center; + -o-transform-origin: center center; + transform-origin: center center; + position: absolute; + top: 15px; + right: -35px; + width: 80px; + color: #ffffff; + background-color: #2f9b45; + padding: 1px 20px; + font-size: 11px; + text-align: center; + text-transform: uppercase; } -.icon-question-sign:before { - content: "\f059"; +.media-grid { + margin: 0; + list-style: none; + *zoom: 1; + margin: 0 -25px; + padding-bottom: 15px; + background: #fbfbfb url("../../../base/images/bg.png"); + border: 1px solid #dddddd; + border-width: 1px 0; } -.icon-info-sign:before { - content: "\f05a"; +.media-grid:before, +.media-grid:after { + display: table; + content: ""; + line-height: 0; } -.icon-screenshot:before { - content: "\f05b"; +.media-grid:after { + clear: both; } -.icon-remove-circle:before { - content: "\f05c"; +.media-item { + position: relative; + float: left; + width: 189px; + padding: 15px; + margin: 15px 0 0 15px; + background-color: white; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.icon-ok-circle:before { - content: "\f05d"; +.media-item span.count { + color: #999; } -.icon-ban-circle:before { - content: "\f05e"; +.media-item .media-image { + margin-bottom: 5px; } -.icon-arrow-left:before { - content: "\f060"; +.media-item .media-edit { + opacity: 0; + position: absolute; + right: 15px; + bottom: 15px; + -webkit-transition: opacity 0.2s ease-in; + -moz-transition: opacity 0.2s ease-in; + -o-transition: opacity 0.2s ease-in; + transition: opacity 0.2s ease-in; } -.icon-arrow-right:before { - content: "\f061"; +.media-item:hover { + z-index: 1; } -.icon-arrow-up:before { - content: "\f062"; +.media-item:hover .media-edit { + opacity: 1; } -.icon-arrow-down:before { - content: "\f063"; +.media-view { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + border: 1px solid #dddddd; + overflow: hidden; + -webkit-transition: all 0.2s ease-in; + -moz-transition: all 0.2s ease-in; + -o-transition: all 0.2s ease-in; + transition: all 0.2s ease-in; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.icon-share-alt:before { - content: "\f064"; +.media-view:hover, +.media-view.hovered { + border-color: #2f9b45; + -webkit-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.1); + box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.1); } -.icon-resize-full:before { - content: "\f065"; +.media-view:hover .banner, +.media-view.hovered .banner { + background-color: #2f9b45; } -.icon-resize-small:before { - content: "\f066"; +.media-view span { + display: none; } -.icon-plus:before { - content: "\f067"; +.media-view .banner { + display: block; + background-color: #b7b7b7; + -webkit-transition: background-color 0.2s ease-in; + -moz-transition: background-color 0.2s ease-in; + -o-transition: background-color 0.2s ease-in; + transition: background-color 0.2s ease-in; } -.icon-minus:before { - content: "\f068"; +.media-image { + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } -.icon-asterisk:before { - content: "\f069"; +.media-heading { + font-size: 18px; + line-height: 1.3; + margin: 5px 0; } -.icon-exclamation-sign:before { - content: "\f06a"; +.media-overlay { + position: relative; + min-height: 35px; } -.icon-gift:before { - content: "\f06b"; +.media-overlay .media-heading { + position: absolute; + left: 0; + right: 0; + bottom: 0; + padding: 12px 10px; + margin: 0; + background-color: #000; + background-color: rgba(0, 0, 0, 0.8); + font-size: 13px; + color: #fff; + z-index: 1; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; } -.icon-leaf:before { - content: "\f06c"; +.media-overlay .media-image { + float: none; + display: block; + margin-right: 0; } -.icon-fire:before { - content: "\f06d"; +.media-item.is-expander .truncator-link { + -webkit-transition: opacity 0.2s ease-in; + -moz-transition: opacity 0.2s ease-in; + -o-transition: opacity 0.2s ease-in; + transition: opacity 0.2s ease-in; + position: absolute; + z-index: 10; + left: 15px; + bottom: 15px; + opacity: 0; } -.icon-eye-open:before { - content: "\f06e"; +.media-item.is-expander:hover { + padding-bottom: 35px; } -.icon-eye-close:before { - content: "\f070"; +.media-item.is-expander:hover .truncator-link { + opacity: 1; } -.icon-warning-sign:before { - content: "\f071"; +.wide .media-item { + width: 186px; } -.icon-plane:before { - content: "\f072"; +.nav-simple, +.nav-aside { + *zoom: 1; + margin: 0; + list-style: none; + padding-bottom: 0; } -.icon-calendar:before { - content: "\f073"; +.nav-simple:before, +.nav-aside:before, +.nav-simple:after, +.nav-aside:after { + display: table; + content: ""; + line-height: 0; } -.icon-random:before { - content: "\f074"; +.nav-simple:after, +.nav-aside:after { + clear: both; } -.icon-comment:before { - content: "\f075"; +.nav-simple > li, +.nav-aside > li { + font-size: 12px; + line-height: 1.1666666666666667em; + padding: 7px 25px; + border-bottom: 1px dotted #dddddd; } -.icon-magnet:before { - content: "\f076"; +.nav-simple > li:last-of-type, +.nav-aside > li:last-of-type { + border-bottom: 0; } -.icon-chevron-up:before { - content: "\f077"; +.nav-simple .ckan-icon, +.nav-aside .ckan-icon { + position: relative; + top: 0px; } -.icon-chevron-down:before { - content: "\f078"; +.nav-aside { + border-top: 1px dotted #DDD; + border-bottom: 1px dotted #DDD; + margin-bottom: 15px; } -.icon-retweet:before { - content: "\f079"; +.nav-item > a, +.nav-aside li a { + color: #333333; + font-size: 14px; + line-height: 20px; + margin: -7px -25px; + padding: 7px 25px; } -.icon-shopping-cart:before { - content: "\f07a"; +.nav-item.active, +.nav-aside li.active { + background-color: #f6f6f6; } -.icon-folder-close:before { - content: "\f07b"; +.nav-item.active > a, +.nav-aside li.active a { + position: relative; + color: #ffffff; + background-color: #8ca0a6; } -.icon-folder-open:before { - content: "\f07c"; +.nav-item.active > a:hover, +.nav-aside li.active a:hover { + color: #ffffff; + background-color: #8ca0a6; } -.icon-resize-vertical:before { - content: "\f07d"; +.nav-item.active > a:before, +.nav-aside li.active a:before { + content: ' '; + position: absolute; + top: 0; + right: -6px; + width: 6px; + height: 34px; + background-image: url("../../../base/images/nav-active.png?1"); } -.icon-resize-horizontal:before { - content: "\f07e"; +.nav-item.active > a span, +.nav-aside li.active a span { + white-space: nowrap; + overflow: hidden; + display: block; } -.icon-bar-chart:before { - content: "\f080"; +.module-narrow .nav-item > a, +.module-narrow .nav-aside li a { + padding-left: 15px; + padding-right: 15px; + position: relative; } -.icon-twitter-sign:before { - content: "\f081"; +.module-narrow .nav-item.image, +.module-narrow .nav-aside li.image { + position: relative; } -.icon-facebook-sign:before { - content: "\f082"; +.module-narrow .nav-item.image > a, +.module-narrow .nav-aside li.image a { + padding-left: 42px; + padding-right: 42px; } -.icon-camera-retro:before { - content: "\f083"; +.module-narrow .nav-item.image > img, +.module-narrow .nav-aside li.image img { + position: absolute; + top: 50%; + left: 15px; + width: 20px; + height: 20px; + margin-top: -10px; + z-index: 2; } -.icon-key:before { - content: "\f084"; +.nav-facet .nav-item > a:hover:after, +.nav-facet .nav-item.active > a:after { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + content: ""; + position: absolute; + top: 50%; + right: 5px; + margin-top: -8px; } -.icon-cogs:before { - content: "\f085"; +.nav-facet .nav-item > a:hover:after { + width: 17px; + height: 17px; + background-position: -17px -16px; } -.icon-comments:before { - content: "\f086"; +.nav-facet .nav-item.active > a:after { + width: 17px; + height: 17px; + background-position: 0px -16px; + right: 3px; } -.icon-thumbs-up:before { - content: "\f087"; +.user-list { + margin: 0; + list-style: none; } -.icon-thumbs-down:before { - content: "\f088"; +.user-list li { + margin: 0 0 10px 0; } -.icon-star-half:before { - content: "\f089"; +.user-list .gravatar { + vertical-align: -4px; + margin-right: 3px; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; } -.icon-heart-empty:before { - content: "\f08a"; +.nav-facet-tertiary { + margin: 10px 0; } -.icon-signout:before { - content: "\f08b"; +.nav-facet-tertiary .module-heading { + margin-bottom: 5px; + padding: 8px 12px; + border-bottom-width: 0; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; } -.icon-linkedin-sign:before { - content: "\f08c"; +.nav-facet-tertiary .module-heading i { + display: none; } -.icon-pushpin:before { - content: "\f08d"; +.nav-facet-tertiary .module-footer { + padding: 8px 12px; + border-top-width: 0; } -.icon-external-link:before { - content: "\f08e"; +.nav-facet-tertiary .module-footer a { + font-weight: normal; + color: #8C8C8C; } -.icon-signin:before { - content: "\f090"; +.nav-facet-tertiary .nav { + margin-bottom: 0; } -.icon-trophy:before { - content: "\f091"; +.nav-facet-tertiary .module-content.empty { + padding: 8px 12px; + margin-top: 0; } -.icon-github-sign:before { - content: "\f092"; +.nav-facet-tertiary .nav li.active { + position: relative; } -.icon-upload-alt:before { - content: "\f093"; +.nav-facet-tertiary .nav li.active > a:hover:after, +.nav-facet-tertiary .nav li.active > a:after { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + width: 17px; + height: 17px; + background-position: 0px -16px; + content: ""; + position: absolute; + top: 50%; + right: 5px; + margin-top: -8px; } -.icon-lemon:before { - content: "\f094"; +.nav-simple > .nav-btn { + padding-left: 0; + padding-right: 0; + text-align: center; } -.icon-phone:before { - content: "\f095"; +.nav-simple > .nav-btn .btn { + display: inline-block; } -.icon-check-empty:before { - content: "\f096"; +.js .js-hide { + display: none; } -.icon-bookmark-empty:before { - content: "\f097"; +.js .js-hide.active { + display: block; } -.icon-phone-sign:before { - content: "\f098"; +.btn, +label { + font-weight: bold; } -.icon-twitter:before { - content: "\f099"; +.btn-rounded { + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; + padding-left: 15px; + padding-right: 15px; } -.icon-facebook:before { - content: "\f09a"; +label { + cursor: pointer; + font-size: 14px; } -.icon-github:before { - content: "\f09b"; +label:after { + content: ":"; } -.icon-unlock:before { - content: "\f09c"; +label.radio:after, +label.checkbox:after { + content: ""; } -.icon-credit-card:before { - content: "\f09d"; +input[type=radio], +input[type=checkbox] { + position: relative; + top: 7px; + padding: 0; + margin: 0; } -.icon-rss:before { - content: "\f09e"; +input[type=radio].checkbox-onown, +input[type=checkbox].checkbox-onown { + top: 0; } -.icon-hdd:before { - content: "\f0a0"; +select { + padding: 4px; } -.icon-bullhorn:before { - content: "\f0a1"; +textarea { + max-width: 100%; } -.icon-bell:before { - content: "\f0a2"; +.control-group .btn { + position: relative; + top: -2px; } -.icon-certificate:before { - content: "\f0a3"; +.control-full input, +.control-full select, +.control-full textarea { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + height: auto; + width: 100%; } -.icon-hand-right:before { - content: "\f0a4"; +.control-medium input, +.control-medium select, +.control-medium textarea { + width: 320px; } -.icon-hand-left:before { - content: "\f0a5"; +.control-large input, +.control-large .control-label { + font-size: 17.5px; + line-height: 30px; } -.icon-hand-up:before { - content: "\f0a6"; +.control-large input { + height: 41px; } -.icon-hand-down:before { - content: "\f0a7"; +.form-actions { + background: none; + margin-left: -25px; + margin-right: -25px; + margin-bottom: 0; + padding-bottom: 0; + text-align: right; } -.icon-circle-arrow-left:before { - content: "\f0a8"; +.form-actions .action-info { + float: left; + width: 50%; + line-height: 2; + text-align: left; + color: #707070; + margin: 0; } -.icon-circle-arrow-right:before { - content: "\f0a9"; +.form-actions .action-info.small { + font-size: 11px; + line-height: 1.2; } -.icon-circle-arrow-up:before { - content: "\f0aa"; +.form-horizontal .control-label { + width: 120px; } -.icon-circle-arrow-down:before { - content: "\f0ab"; +.form-horizontal .controls { + margin-left: 130px; } -.icon-globe:before { - content: "\f0ac"; +.form-horizontal .info-block { + position: relative; + display: block; + font-size: 11px; + color: #aaaaaa; + line-height: 1.3; + padding: 6px 0 6px 25px; + margin-top: 6px; } -.icon-wrench:before { - content: "\f0ad"; +.form-horizontal .info-help { + padding: 6px 0; } -.icon-tasks:before { - content: "\f0ae"; +.form-horizontal .info-help:before { + display: none; } -.icon-filter:before { - content: "\f0b0"; +.form-horizontal .info-help-tight { + margin-top: -10px; } -.icon-briefcase:before { - content: "\f0b1"; +.form-horizontal .info-inline { + float: right; + width: 265px; + margin-top: 0; + padding-bottom: 0; } -.icon-fullscreen:before { - content: "\f0b2"; +.form-horizontal .control-medium .info-block.info-inline { + width: 165px; } -.icon-group:before { - content: "\f0c0"; +.form-horizontal .info-block:before { + font-size: 2.2em; + position: absolute; + left: 0; + top: 2px; } -.icon-link:before { - content: "\f0c1"; +.form-horizontal .info-inline:before { + top: 8px; } -.icon-cloud:before { - content: "\f0c2"; +.info-block .icon-large, +.info-inline .icon-large { + float: left; + font-size: 22px; + margin-right: 15px; } -.icon-beaker:before { - content: "\f0c3"; +.form-horizontal .info-block a { + color: #aaaaaa; + text-decoration: underline; } -.icon-cut:before { - content: "\f0c4"; +.form-horizontal .form-actions { + padding-left: 25px; + padding-right: 25px; } -.icon-copy:before { - content: "\f0c5"; +.form-inline input { + padding-bottom: 9px; } -.icon-paper-clip:before { - content: "\f0c6"; -} -.icon-save:before { - content: "\f0c7"; +.form-inline select { + margin-top: 0; } -.icon-sign-blank:before { - content: "\f0c8"; +.form-inline .btn { + margin-left: 5px; } -.icon-reorder:before { - content: "\f0c9"; +.form-narrow label { + margin-bottom: 0; } -.icon-list-ul:before { - content: "\f0ca"; +.form-narrow select { + width: 100%; } -.icon-list-ol:before { - content: "\f0cb"; +.form-narrow .form-actions { + margin-left: -15px; + margin-right: -15px; + padding: 10px 15px 0; } -.icon-strikethrough:before { - content: "\f0cc"; +.form-select label { + margin-right: 5px; } -.icon-underline:before { - content: "\f0cd"; +.simple-input label, +.simple-input button { + display: none; } -.icon-table:before { - content: "\f0ce"; +.simple-input .field { + position: relative; } -.icon-magic:before { - content: "\f0d0"; +.simple-input .field-bordered { + border-bottom: 1px dotted #dddddd; } -.icon-truck:before { - content: "\f0d1"; +.simple-input .field input { + width: 100%; + height: auto; + margin: 0 -7px; + padding: 7px 5px; } -.icon-pinterest:before { - content: "\f0d2"; +.simple-input .field .btn-search { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + background-position: -51px -16px; + position: absolute; + display: block; + height: 17px; + width: 17px; + top: 50%; + right: 0; + margin-top: -8px; + background-color: transparent; + border: none; + text-indent: -999em; } -.icon-pinterest-sign:before { - content: "\f0d3"; +.editor textarea { + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; + border-bottom: none; } -.icon-google-plus-sign:before { - content: "\f0d4"; +.editor .editor-info-block { + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; + display: block; + float: none; + padding: 4px 10px; + background: #ebebeb; + width: auto; + border: 1px solid #cccccc; + border-top: none; + font-size: 11px; + color: #282828; } -.icon-google-plus:before { - content: "\f0d5"; +.editor .editor-info-block a { + color: #2f9b45; + text-decoration: none; } -.icon-money:before { - content: "\f0d6"; +.control-custom { + font-size: 0; } -.icon-caret-down:before { - content: "\f0d7"; +.control-custom label { + margin-bottom: 0; } -.icon-caret-up:before { - content: "\f0d8"; +.control-custom input { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + width: 140px; } -.icon-caret-left:before { - content: "\f0d9"; +.control-custom input:last-of-type { + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; } -.icon-caret-right:before { - content: "\f0da"; +.control-custom .checkbox { + display: inline-block; + margin-left: 5px; } -.icon-columns:before { - content: "\f0db"; +.control-custom .checkbox input { + width: auto; } -.icon-sort:before { - content: "\f0dc"; +.control-custom.disabled label, +.control-custom.disabled input { + color: #aaaaaa; + text-decoration: line-through; + text-shadow: none; } -.icon-sort-down:before { - content: "\f0dd"; +.control-custom.disabled input { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + background-color: #f3f3f3; } -.icon-sort-up:before { - content: "\f0de"; +.control-custom.disabled .checkbox { + color: #444444; + text-decoration: none; } -.icon-envelope-alt:before { - content: "\f0e0"; +.control-custom .checkbox.btn { + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; + position: relative; + top: 0; + left: 5px; + height: 1px; + width: 9px; + padding: 3px 8px; + line-height: 18px; } -.icon-linkedin:before { - content: "\f0e1"; +.control-custom .checkbox.btn span { + display: none; + width: 30px; } -.icon-undo:before { - content: "\f0e2"; +.control-custom .checkbox.btn:before { + position: relative; + top: 1px; + left: -1px; + color: #fff; } -.icon-legal:before { - content: "\f0e3"; +.control-custom .checkbox.btn input { + display: none; } -.icon-dashboard:before { - content: "\f0e4"; +.control-custom.disabled .checkbox.btn { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #36b24f; + background-image: -moz-linear-gradient(top, #3bc256, #2f9b45); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#3bc256), to(#2f9b45)); + background-image: -webkit-linear-gradient(top, #3bc256, #2f9b45); + background-image: -o-linear-gradient(top, #3bc256, #2f9b45); + background-image: linear-gradient(to bottom, #3bc256, #2f9b45); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3bc256', endColorstr='#ff2f9b45', GradientType=0); + border-color: #2f9b45 #2f9b45 #1d602b; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + *background-color: #2f9b45; + /* Darken IE7 buttons by default so they stand out more given they won't have borders */ + + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } -.icon-comment-alt:before { - content: "\f0e5"; +.control-custom.disabled .checkbox.btn:hover, +.control-custom.disabled .checkbox.btn:focus, +.control-custom.disabled .checkbox.btn:active, +.control-custom.disabled .checkbox.btn.active, +.control-custom.disabled .checkbox.btn.disabled, +.control-custom.disabled .checkbox.btn[disabled] { + color: #ffffff; + background-color: #2f9b45; + *background-color: #29873c; } -.icon-comments-alt:before { - content: "\f0e6"; +.control-custom.disabled .checkbox.btn:active, +.control-custom.disabled .checkbox.btn.active { + background-color: #237434 \9; } -.icon-bolt:before { - content: "\f0e7"; +.control-custom.disabled .checkbox.btn .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; } -.icon-sitemap:before { - content: "\f0e8"; +.alert-danger a, +.alert-error a { + color: #b55457; } -.icon-umbrella:before { - content: "\f0e9"; +.control-group.error input, +.control-group.error select, +.control-group.error textarea, +.control-group.error .input-prepend .add-on, +.control-group.error .input-append .add-on { + border-color: #c6898b; } -.icon-paste:before { - content: "\f0ea"; +.error-inline { + color: #b55457; } -.icon-user-md:before { - content: "\f200"; +.error-block, +.error-inline { + font-size: 12px; } -.pill { - background-color: #cccccc; +.error-block { + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; + display: block; + padding: 6px 8px 3px; + background: #c6898b; + margin: -3px 0 0; color: #ffffff; - padding: 1px 5px 1px 8px; - margin-right: 5px; - -webkit-border-radius: 7px; - -moz-border-radius: 7px; - border-radius: 7px; + width: 208px; } -.pill a { - color: #ffffff; +.control-medium .error-block { + width: 318px; } -.pill a.remove { - font-size: 11px; +.control-full .error-block { + width: auto; } -.tag { - background: url("../../../base/images/background-tag.png") no-repeat -13px center; - position: relative; - display: block; - font-size: 11px; - line-height: 27px; - color: #045b04; - padding-left: 10px; - padding-right: 5px; - margin-right: 11px; +.control-group.error .input-prepend .error-block, +.control-custom.error .error-block { + width: auto; } -.tag:before { - content: ""; - background: url("../../../base/images/background-tag.png") no-repeat center left; - position: absolute; - display: block; - top: 0; - bottom: 0; - right: -11px; - width: 11px; +.control-custom.error .error-block { + width: 401px; } -.unstyled { - margin: 0; - list-style: none; -} -.simple-item { - font-size: 12px; - line-height: 1.1666666666666667em; - padding: 7px 25px; - border-bottom: 1px dotted #cccccc; -} -.simple-item:last-of-type { - border-bottom: 0; +.control-select.error .error-block { + width: 196px; } -.simple-list { - *zoom: 1; +.stages { margin: 0; list-style: none; + *zoom: 1; + color: #aeaeae; + counter-reset: stage; + margin: -20px -25px 20px; + overflow: hidden; } -.simple-list:before, -.simple-list:after { +.stages:before, +.stages:after { display: table; content: ""; + line-height: 0; } -.simple-list:after { +.stages:after { clear: both; } -.simple-list > li { - font-size: 12px; - line-height: 1.1666666666666667em; - padding: 7px 25px; - border-bottom: 1px dotted #cccccc; +.stages li { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + line-height: 27px; + counter-increment: stage; + width: 33.33%; + background-color: #ededed; + float: left; + padding: 10px 20px; + position: relative; + z-index: 0; } -.simple-list > li:last-of-type { - border-bottom: 0; +.stages li:before { + -webkit-border-radius: 14px; + -moz-border-radius: 14px; + border-radius: 14px; + content: counter(stage); + display: inline-block; + width: 27px; + height: 27px; + margin-right: 5px; + font-weight: bold; + text-align: center; + color: #ffffff; + background-color: #aeaeae; + z-index: 1; } -.simple-list .ckan-icon { - position: relative; - top: 0px; +.stages li:after { + left: 0; + border: solid rgba(237, 237, 237, 0); + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; + border-top-color: #ededed; + border-bottom-color: #ededed; + border-width: 29px; + top: 50%; + margin-top: -29px; + margin-left: -30px; } -.module-narrow .simple-list > li { - padding-left: 15px; - padding-right: 15px; +.stages li.last { position: relative; + right: -1px; } -.listing li { - text-align: right; - margin-bottom: 5px; -} -.listing .key { - clear: right; - font-weight: bold; +.stages li.last, +.stages li.last .highlight { + -webkit-border-radius: 0 3px 0 0; + -moz-border-radius: 0 3px 0 0; + border-radius: 0 3px 0 0; } -.js .tab-content { - display: none; +.stages li.first:after { + content: none; + border: none; } -.js .tab-content.active { - display: block; +.stages li.active:after { + border-color: rgba(140, 198, 138, 0); + border-top-color: #8cc68a; + border-bottom-color: #8cc68a; } -.module { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); - background-color: #ffffff; - margin-bottom: 20px; +.stages li.complete:after { + border-color: rgba(197, 226, 196, 0); + border-top-color: #c5e2c4; + border-bottom-color: #c5e2c4; } -.module-heading { - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - font-size: 14px; - line-height: 1.3; - padding: 7px 25px; - border-bottom: 1px solid #d0d0d0; - background-color: #f3f3f3; - background-image: -moz-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -ms-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f0f0f0)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -o-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: linear-gradient(top, #f5f5f5, #f0f0f0); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f0f0f0', GradientType=0); +.stages.stage-3 li.complete:first-child:after { + content: none; } -.module-heading-secondary { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - border-top: 1px solid #d0d0d0; +.stages li.active, +.stages li.complete { + background: none; } -.module-heading [class^=icon]:before { - font-size: 1.2em; - line-height: 1; - position: relative; - top: 1px; - margin-right: 0.1em; +.stages li.active:before { + color: #8cc68a; + background: #ffffff; } -.module-heading .action { - float: right; - color: #8c8c8c; - font-size: 11px; - text-decoration: underline; +.stages li.complete:before { + color: #c5e2c4; + background: #eef6ed; } -.module-content { - padding: 0 25px; - margin: 20px 0; +.stages li .highlight { + display: block; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + width: 100%; + padding: 10px 52px; + border: none; + text-align: left; + text-decoration: none; + line-height: 27px; + z-index: -1; } -.module-content:first-child { - margin-top: 0; - padding-top: 20px; +.stages li.active .highlight { + color: #ffffff; + background: #8cc68a; } -.module-content:last-child { - margin-bottom: 0; - padding-bottom: 20px; +.stages li.complete .highlight { + color: #eef6ed; + background: #c5e2c4; } -.module-content > :last-child { +.alert > :last-child { margin-bottom: 0; } -.module-border-top { - border-top: 1px dotted #cccccc; +.slug-preview { + font-size: 14px; + line-height: 1.5; + margin-top: 5px; + margin-left: 10px; } -.module-border-bottom { - border-bottom: 1px dotted #cccccc; +.slug-preview-value { + background-color: #faedcf; + margin-right: 3px; } -.module-footer { - padding: 7px 25px 7px; - border-top: 1px dotted #cccccc; +.resource-upload-field { + position: relative; + overflow: hidden; + display: inline-block; + vertical-align: bottom; } -.module .read-more { - font-weight: bold; - color: #000000; +.resource-upload-field label { + z-index: 0; } -.module .pagination { - height: 34px; - margin-bottom: 0; - border-top: 1px solid #d0d0d0; +.resource-upload-field input { + opacity: 0; + filter: alpha(opacity=0); + position: absolute; + top: 0; + right: 0; + z-index: 1; + margin: 0; + border: solid transparent; + border-width: 100px 0 0 200px; + cursor: pointer; + direction: ltr; + -moz-transform: translate(-300px, 0) scale(4); } -.module .pagination > ul { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - border: 0; +.resource-upload-field.loading { + display: inline-block; + background: url("../../../base/images/loading-spinner.gif") no-repeat center right; + padding-right: 5px; } -.module .pagination li a { - border-top: none; - border-bottom: none; +.select2-container .select2-choice input, +.select2-container-multi .select2-choices .select2-search-field:first-child input { + font-size: 14px; } -.module .pagination li:first-child a, -.module .pagination li:last-child a { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; +.select2-container-multi .select2-choices .select2-search-field input { + height: 29px; } -.module .pagination li:first-child a { - border-left-width: 0; +.select2-container .select2-choice input, +.select2-container-multi .select2-choices .select2-search-field:first-child input { + padding-left: 10px; } -.module .pagination li:last-child a { - border-right-width: 0; +.select2-container { + margin-top: 1px; } -.module .pagination li.active a { - border-left-width: 1px; - border-right-width: 1px; +.select2-container-multi { + margin-top: 0; } -.module .action { - text-align: center; +.select2-container-multi .select2-choices .select2-search-choice { + padding: 5px 8px 5px 22px; } -.module-shallow .module-content { - padding: 10px; - margin: 0; +.select2-container-multi.select2-container .select2-choices { + padding-top: 3px; + padding-bottom: 3px; } -.module-shallow .module-content:first-child { - padding-top: 10px; -} -.module-shallow .module-content:last-child { - padding-bottom: 10px; +.select2-search-choice-close, +.select2-container-multi .select2-search-choice-close { + top: 6px; + left: 5px; } -.module-shallow small { - font-size: 11px; - display: block; +.select2-container-multi .select2-choices { + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; + -moz-transition: border linear 0.2s, box-shadow linear 0.2s; + -o-transition: border linear 0.2s, box-shadow linear 0.2s; + transition: border linear 0.2s, box-shadow linear 0.2s; + background-color: #ffffff; + border: 1px solid #cccccc; } -.module-narrow .module-heading, -.module-narrow .module-content, -.module-narrow .module-footer { - padding-left: 15px; - padding-right: 15px; +.select2-container-active .select2-choices, +.select2-container-multi.select2-container-active .select2-choices { + border-color: rgba(82, 168, 236, 0.8); + outline: 0; + outline: thin dotted \9; + /* IE6-9 */ + + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); } -.module-grid { - margin: 0; - list-style: none; - margin: 0; - list-style: none; - *zoom: 1; - margin-left: -20px; - padding: 0; +.select2-container-multi .select2-drop { + margin-top: -2px; } -.module-grid:before, -.module-grid:after { - display: table; - content: ""; +.select2-container .select2-results li { + line-height: 18px; + padding-top: 4px; + padding-bottom: 4px; } -.module-grid:after { - clear: both; +.control-full .select2-container { + width: 520px !important; } -.module-item { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - width: 33.33%; - padding-left: 20px; - padding-bottom: 25px; - float: left; - float: left; - margin-left: 20px; - width: 460px; - padding-top: 10px; - padding-bottom: 10px; - padding-right: 50px; - overflow: hidden; - position: relative; +.control-group.error .select2-container input:focus, +.control-group.error .select2-container select:focus, +.control-group.error .select2-container textarea:focus { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } -.module-item.first { - clear: left; +.dataset-item { + border-bottom: 1px dotted #dddddd; + padding-bottom: 20px; + margin-bottom: 20px; } -.group .content img { - margin: 0 -5px 5px; - max-width: initial; +.dataset-item:last-of-type { + border-bottom: none; + margin-bottom: 0; + padding-bottom: 0; } -.group .content h3 { - font-size: 14px; +.dataset-heading { + font-size: 16px; + margin-top: 0; + margin-bottom: 8px; line-height: 1.3; } -.group-listing { - margin-left: -20px; +.dataset-heading a { + color: #333333; } -.ckanext-datapreview { +.dataset-heading .label { position: relative; + top: -1px; } -.ckanext-datapreview > iframe { - min-height: 400px; -} -.ckanext-datapreview > img { - max-height: 500px; - max-width: 100%; - overflow: hidden; +.dataset-private { + margin-right: 10px; + text-transform: uppercase; } -.package-info h4 { - margin-bottom: 10px; +.dataset-private .icon-lock { + width: 9px; } -.media { - position: relative; - overflow: hidden; +.dataset-private.pull-right { + margin-right: 0; } -.media-content > :last-child { - margin-bottom: 0; +.dataset-resources { + margin-top: 8px; } -.media-heading { - font-size: 14px; - line-height: 1.3em; - margin: 5px 0; +.dataset-resources li { + display: inline; } -.media-image, -.media .gravatar { - position: relative; - float: left; - margin-right: 10px; - overflow: hidden; +.dataset-resources li a { + background-color: #aaaaaa; } -.media-image:after { - -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3); - -moz-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3); - box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3); - content: ""; - position: absolute; +.dataset-heading .popular { top: 0; - left: 0; - right: 0; - bottom: 0; - z-index: 1; } -.media-image img { - display: block; - margin: 0 auto; -} -.media-vertical .media-image, -.media-vertical .media-content { - float: none; - display: block; -} -.media-vertical .media-image { - margin-right: 0; - max-height: 125px; -} -.media-grid, -ul.media-grid, -ol.media-grid { +.resource-list { margin: 0; list-style: none; - *zoom: 1; - margin-left: -20px; + margin: -10px -10px 10px -10px; } -.media-grid:before, -ul.media-grid:before, -ol.media-grid:before, -.media-grid:after, -ul.media-grid:after, -ol.media-grid:after { - display: table; - content: ""; +.resource-item { + position: relative; + padding: 10px 10px 10px 60px; + margin-bottom: 0px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.media-grid:after, -ul.media-grid:after, -ol.media-grid:after { - clear: both; +.resource-item:hover { + background-color: #eeeeee; } -.media-item { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - width: 33.33%; - padding-left: 20px; - padding-bottom: 25px; - float: left; +.resource-item .heading { + color: #000000; + font-size: 14px; + font-weight: bold; } -.media-item.first { - clear: left; +.resource-item .format-label { + position: absolute; + top: 10px; + left: 10px; } -.media-item .media-content { - min-height: 63px; +.resource-item .description { + font-size: 12px; + margin-bottom: 0; } -.related-item.expanded { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - background-color: #ffffff; - background-color: rgba(255, 255, 255, 0.9); - z-index: 2; +.resource-item .btn-group { + position: absolute; + top: 14px; + right: 10px; } -.media-wide { - padding: 0; +.dataset-resource-form .dataset-form-resource-types { + margin-bottom: 5px; } -.media-wide .media { - float: left; - margin-left: 20px; - width: 460px; +.dataset-form-resource-types .ckan-icon { + position: relative; + top: 3px; } -.media-overlay { +.dataset-form-resource-types .radio { + font-weight: normal; + padding-left: 0; + padding-right: 18px; +} +.dataset-form-resource-types label { position: relative; - min-height: 35px; } -.media-overlay .media-heading { +.dataset-form-resource-types input[type=radio]:checked + label { + font-weight: bold; +} +.dataset-form-resource-types input[type=radio]:checked + label:after { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + width: 16px; + height: 16px; + background-position: -192px 0; + display: block; + content: ""; position: absolute; + top: auto; left: 0; - right: 0; - bottom: 0; - padding: 12px 10px; + bottom: -12px; +} +.dataset-form-resource-types input[type=radio] { + display: none; +} +.tag-list { margin: 0; - background-color: #000; - background-color: rgba(0, 0, 0, 0.8); - font-size: 13px; - color: #fff; - z-index: 1; + list-style: none; + padding: 10px 10px 5px 10px; } -.media-overlay .media-image { - float: none; - display: block; +.tag-list li { + display: inline-block; + margin-right: 5px; +} +.tag-list li:last-child { margin-right: 0; } -.banner { - -webkit-transform: rotate(45deg); - -moz-transform: rotate(45deg); - -ms-transform: rotate(45deg); - -o-transform: rotate(45deg); - transform: rotate(45deg); - -webkit-transform-origin: center center; - -moz-transform-origin: center center; - -ms-transform-origin: center center; - -o-transform-origin: center center; - transform-origin: center center; - position: absolute; - top: 15px; - right: -35px; - width: 80px; - color: #ffffff; - background: #707070; - padding: 1px 20px; - font-size: 11px; - text-align: center; - text-transform: uppercase; +.additional-info td, +.additional-info th { + width: 50%; } -.nav-simple { - *zoom: 1; - margin: 0; - list-style: none; - padding-bottom: 0; +.label[data-format=html], +.label[data-format*=html] { + background-color: #55a1ce; } -.nav-simple:before, -.nav-simple:after { - display: table; - content: ""; +.label[data-format=json], +.label[data-format*=json] { + background-color: #ef7100; } -.nav-simple:after { - clear: both; +.label[data-format=xml], +.label[data-format*=xml] { + background-color: #ef7100; } -.nav-simple > li { - font-size: 12px; - line-height: 1.1666666666666667em; - padding: 7px 25px; - border-bottom: 1px dotted #cccccc; +.label[data-format=text], +.label[data-format*=text] { + background-color: #74cbec; } -.nav-simple > li:last-of-type { - border-bottom: 0; +.label[data-format=csv], +.label[data-format*=csv] { + background-color: #dfb100; } -.nav-simple .ckan-icon { - position: relative; - top: 0px; +.label[data-format=xls], +.label[data-format*=xls] { + background-color: #2db55d; } -.nav-item > a { - color: #333333; - margin: -7px -25px; - padding: 7px 25px; +.label[data-format=zip], +.label[data-format*=zip] { + background-color: #686868; } -.nav-item.active { - background-color: #f2f2f2; +.label[data-format=api], +.label[data-format*=api] { + background-color: #ec96be; } -.nav-item.active > a span { - white-space: nowrap; - overflow: hidden; - display: block; +.label[data-format=pdf], +.label[data-format*=pdf] { + background-color: #e0051e; +} +.label[data-format=rdf], +.label[data-format*=rdf], +.label[data-format*=nquad], +.label[data-format*=ntriples], +.label[data-format*=turtle] { + background-color: #0b4498; } -.nav-item.active > a { - background: url("../../../base/images/background-tag.png") no-repeat -13px center; +.search-form { + margin-bottom: 20px; + padding-bottom: 25px; + border-bottom: 1px dotted #dddddd; +} +.search-form .search-input { position: relative; - display: block; - font-size: 11px; - line-height: 27px; - color: #045b04; - padding-left: 10px; - padding-right: 5px; - margin-right: 11px; + margin-bottom: 20px; +} +.search-form .search-input input { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; - font-size: 12px; - font-weight: bold; - position: relative; - left: 4px; - margin-left: -25px; - margin-right: -20px; - padding-left: 10px; - padding-right: 0px; - padding: 1px 22px; + margin: 0; + width: 100%; + height: auto; } -.nav-item.active > a:before { - content: ""; - background: url("../../../base/images/background-tag.png") no-repeat center left; - position: absolute; +.search-form .search-input button { + cursor: pointer; display: block; - top: 0; - bottom: 0; - right: -11px; - width: 11px; + position: absolute; + top: 50%; + margin-top: -10px; + right: 10px; + height: 20px; + padding: 0; + border: none; + background: transparent; } -.nav-item [class^=icon] { - font-size: 1.2em; - margin: -1px 0 -1px -1px; +.search-form .search-input button span { + display: none; } -.module-narrow .nav-item > a { - padding-left: 15px; - padding-right: 15px; - position: relative; +.search-form .search-input button i { + color: #cccccc; + -webkit-transition: color 0.2s ease-in; + -moz-transition: color 0.2s ease-in; + -o-transition: color 0.2s ease-in; + transition: color 0.2s ease-in; } -.module-narrow .nav-item.active > a { - padding-left: 12px; - padding-right: 12px; +.search-form .search-input button:hover i { + color: #000000; } -.module-narrow .nav-item.image { - position: relative; +.search-form .search-input.search-giant input { + font-size: 16px; + padding: 15px; } -.module-narrow .nav-item.image > a { - padding-left: 42px; - padding-right: 42px; +.search-form .search-input.search-giant button { + margin-top: -15px; + right: 15px; + height: 30px; } -.module-narrow .nav-item.image > img { - position: absolute; - top: 50%; - left: 15px; - width: 20px; - height: 20px; - margin-top: -10px; - z-index: 2; +.search-form .search-input.search-giant button i { + font-size: 28px; + width: 28px; } -.nav-facet .nav-item > a:hover:after, -.nav-facet .nav-item.active > a:after { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - content: ""; - position: absolute; - top: 50%; - right: 5px; - margin-top: -8px; +.search-form .control-order-by { + float: right; + margin: 0 0 0 15px; } -.nav-facet .nav-item > a:hover:after:last-child, -.nav-facet .nav-item.active > a:after:last-child { - *margin-left: 0; +.search-form .control-order-by label, +.search-form .control-order-by select { + display: inline; } -.nav-facet .nav-item > a:hover:after { - width: 17px; - height: 17px; - background-position: -17px -16px; +.search-form .control-order-by select { + width: 160px; + margin: 0; } -.nav-facet .nav-item.active > a:after { - width: 17px; - height: 17px; - background-position: 0px -16px; - right: 3px; +.search-form h2 { + font-size: 24px; + line-height: 1.3; + color: #000000; + margin-bottom: 0; } -.js .js-hide { - display: none; +.search-form .filter-list { + color: #444444; + line-height: 32px; + margin: 10px 0 0 0; } -.js .js-hide.active { +.search-form .filter-list .pill { + line-height: 21px; +} +.search-form .filter-list .extra { + margin-top: 10px; + font-size: 18px; + font-weight: normal; + color: #000000; +} +.tertiary .control-order-by { + float: none; + margin: 0; +} +.tertiary .control-order-by label { display: block; + margin-bottom: 5px; + font-weight: normal; + font-size: 12px; } -.btn, -label { - font-weight: bold; +.tertiary .control-order-by select { + display: block; + font-size: 12px; + width: 100%; } -label { - cursor: pointer; - font-size: 14px; - line-height: 2; +.tertiary .search-input { + margin-bottom: 10px; } -label:after { - content: ":"; +.group .media-vertical .image { + margin: 0 -5px 5px; } -label.radio:after, -label.checkbox:after { - content: ""; +.group-list:nth-child(odd) { + clear: left; } -input, -textarea, -select, -.uneditable-input { - font-size: 14px; - padding: 8px 10px; +.group-list .module-heading { + padding-top: 15px; + padding-bottom: 15px; } -input[type=radio], -input[type=checkbox] { - position: relative; - top: 7px; - padding: 0; - margin: 0; +.group-list .dataset-content { + min-height: 54px; } -input[type=radio].checkbox-onown, -input[type=checkbox].checkbox-onown { - top: 0; +.group-list .module-heading h3 { + margin-bottom: 2px; } -select { - margin-top: 6px; - padding: 4px; +.group-list .module-heading h3 a { + color: #333333; } -textarea { - max-width: 100%; +.group-list .module-heading .media-image { + overflow: hidden; + max-height: 60px; } -.input-prepend .add-on { - padding: 8px 8px; - font-size: 14px; +.group-list .module-heading .media-image img { + max-width: 85px; } -.control-group .btn { +.toolbar { + *zoom: 1; position: relative; - top: -2px; + margin-bottom: 10px; + padding: 5px 0; } -.control-full input, -.control-full select, -.control-full textarea { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - height: auto; - width: 100%; +.toolbar:before, +.toolbar:after { + display: table; + content: ""; + line-height: 0; } -.control-medium input, -.control-medium select, -.control-medium textarea { - width: 320px; +.toolbar:after { + clear: both; } -.control-large input, -.control-large .control-label { - font-size: 18px; +.page_primary_action { + margin-bottom: 20px; } -.form-actions { - background: none; - margin-left: -25px; - margin-right: -25px; - margin-bottom: 0; - padding-bottom: 0; - text-align: right; -} -.form-actions .action-info { +.toolbar .breadcrumb { + *zoom: 1; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + position: relative; float: left; - width: 50%; - line-height: 2; - text-align: left; - color: #707070; margin: 0; + padding: 0; + border: none; + background: none; + font-size: 20px; + line-height: 1.3; } -.form-actions .action-info.small { - font-size: 11px; - line-height: 1.2; +.toolbar .breadcrumb:before, +.toolbar .breadcrumb:after { + display: table; + content: ""; + line-height: 0; } -.form-horizontal .control-label { - width: 120px; - line-height: 1.3; - padding-top: 9px; +.toolbar .breadcrumb:after { + clear: both; } -.form-horizontal .control-large input, -.form-horizontal .control-large .control-label { - font-size: 18px; - line-height: 2; +.toolbar .breadcrumb li:after { + content: " / "; } -.form-horizontal .control-large .control-label { - padding-top: 10px; +.toolbar .breadcrumb li.active:after { + content: ""; } -.form-horizontal .controls { - margin-left: 130px; +.toolbar .breadcrumb li:last-of-type:after { + content: ""; } -.form-horizontal .info-block { - position: relative; - display: block; - font-size: 11px; - color: #aeaeae; - line-height: 1.3; - padding: 6px 0 6px 25px; - margin-top: 6px; +.toolbar .home a { + text-decoration: none; } -.form-horizontal .info-inline { - float: right; - width: 265px; - margin-top: 0; +.toolbar .home span { + display: none; } -.form-horizontal .control-medium .info-block.info-inline { - width: 165px; +.toolbar .breadcrumb a { + color: #505050; } -.form-horizontal .info-block:before { - font-size: 2.2em; +.toolbar .breadcrumb .active a, +.toolbar .breadcrumb a.active { + font-weight: bold; +} +.actions { + margin: 0; + list-style: none; position: absolute; - left: 0; - top: 2px; + top: 10px; + right: 10px; + z-index: 1; } -.form-horizontal .info-inline:before { - top: 8px; +.actions li { + display: inline-block; + margin-right: 5px; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; } -.info-block .icon-large, -.info-inline .icon-large { +.actions li:last-of-type { + margin-right: 0; +} +.hide-heading { + display: none; +} +.page-header { + *zoom: 1; + border-bottom: 1px solid #dddddd; + background-color: #f6f6f6; + -webkit-border-radius: 0 3px 0 0; + -moz-border-radius: 0 3px 0 0; + border-radius: 0 3px 0 0; +} +.page-header:before, +.page-header:after { + display: table; + content: ""; + line-height: 0; +} +.page-header:after { + clear: both; +} +.page-header .nav-tabs { float: left; - font-size: 22px; - margin-right: 15px; + margin-bottom: -1px; } -.form-horizontal .info-block a { - color: #aeaeae; - text-decoration: underline; +.page-header .nav-tabs li.active a, +.page-header .nav-tabs a:hover { + background-color: #ffffff; } -.form-horizontal .form-actions { - padding-left: 25px; - padding-right: 25px; +.page-header .content_action { + float: right; + margin-top: -5px; + margin-right: -7px; } -.form-inline input { - padding-bottom: 9px; +.no-nav .page-header { + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } -.form-inline select { - margin-top: 0; +h1 { + font-size: 28px; } -.form-inline .btn { - margin-left: 5px; +h2 { + font-size: 21px; } -.form-narrow label { - margin-bottom: 0; +h3 { + font-size: 18px; } -.form-narrow select { - width: 100%; +h4 { + font-size: 14px; } -.form-narrow .form-actions { - margin-left: -15px; - margin-right: -15px; - padding: 10px 15px 0; +h1, +h2, +h3, +h4 { + line-height: 1.5; } -.form-select label { - margin-right: 5px; +h1 small, +h2 small, +h3 small, +h4 small { + font-size: 14px; } -.simple-input label, -.simple-input button { - display: none; +.prose h1, +.prose heading-1 h2, +.prose heading-2 { + margin-bottom: 15px; } -.simple-input .field { - position: relative; +.prose h3, +.prose heading-3 { + margin-bottom: 10px; } -.simple-input .field-bordered { - border-bottom: 1px dotted #cccccc; +.table-chunky td, +.table-chunky th { + padding: 12px 15px; + font-size: 12px; } -.simple-input .field input { - width: 100%; - height: auto; - margin: 0 -7px; - padding: 7px 5px; +.table-chunky thead th, +.table-chunky thead td { + color: #ffffff; + background-color: #aaaaaa; + padding-top: 10px; + padding-bottom: 10px; } -.simple-input .field .btn-search { +.table-striped tbody tr:nth-child(odd) td, +.table-striped tbody tr:nth-child(odd) th { + background-color: transparent; +} +.table-striped tbody tr:nth-child(even) td, +.table-striped tbody tr:nth-child(even) th { + background-color: #f2f2f2; +} +.table-chunky.table-bordered { + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; +} +.table-chunky.table-bordered thead:first-child tr:first-child th:first-child, +.table-chunky.table-bordered tbody:first-child tr:first-child td:first-child { + -webkit-border-top-left-radius: 2px; + -moz-border-radius-topleft: 2px; + border-top-left-radius: 2px; +} +.table-chunky.table-bordered thead:first-child tr:first-child th:last-child, +.table-chunky.table-bordered tbody:first-child tr:first-child td:last-child { + -webkit-border-top-right-radius: 2px; + -moz-border-radius-topright: 2px; + border-top-right-radius: 2px; +} +.table-chunky.table-bordered thead:last-child tr:last-child th:first-child, +.table-chunky.table-bordered tbody:last-child tr:last-child td:first-child { + -webkit-border-radius: 0 0 0 2px; + -moz-border-radius: 0 0 0 2px; + border-radius: 0 0 0 2px; + -webkit-border-bottom-left-radius: 2px; + -moz-border-radius-bottomleft: 2px; + border-bottom-left-radius: 2px; +} +.table-chunky.table-bordered thead:last-child tr:last-child th:last-child, +.table-chunky.table-bordered tbody:last-child tr:last-child td:last-child { + -webkit-border-bottom-right-radius: 2px; + -moz-border-radius-bottomright: 2px; + border-bottom-right-radius: 2px; +} +.ellipsis { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.ckan-icon { *margin-right: .3em; display: inline-block; vertical-align: text-bottom; @@ -5209,1524 +6647,1336 @@ textarea { background-image: url("../../../base/images/sprite-ckan-icons.png"); background-repeat: no-repeat; background-position: 16px 16px; - width: 17px; - height: 17px; - background-position: -51px -16px; - position: absolute; - display: block; - height: 17px; - width: 17px; - top: 50%; - right: 0; - margin-top: -8px; - background-color: transparent; - border: none; - text-indent: -999em; } -.simple-input .field .btn-search:last-child { - *margin-left: 0; +.ckan-icon-fb { + width: 16px; + height: 16px; + background-position: 0px 0; } -.editor textarea { - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - border-bottom: none; +.ckan-icon-gplus { + width: 16px; + height: 16px; + background-position: -16px 0; } -.editor .editor-info-block { - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - display: block; - float: none; - padding: 4px 10px; - background: #ebebeb; +.ckan-icon-twitter { + width: 16px; + height: 16px; + background-position: -32px 0; +} +.ckan-icon-email { + width: 16px; + height: 16px; + background-position: -48px 0; +} +.ckan-icon-share { + width: 16px; + height: 16px; + background-position: -64px 0; +} +.ckan-icon-feed { + width: 16px; + height: 16px; + background-position: -80px 0; +} +.ckan-icon-calendar { + width: 16px; + height: 16px; + background-position: -96px 0; +} +.ckan-icon-file { + width: 16px; + height: 16px; + background-position: -112px 0; +} +.ckan-icon-lock { + width: 16px; + height: 16px; + background-position: -128px 0; +} +.ckan-icon-link-file { + width: 16px; + height: 16px; + background-position: -144px 0; +} +.ckan-icon-link-plugin { + width: 16px; + height: 16px; + background-position: -160px 0; +} +.ckan-icon-upload-file { + width: 16px; + height: 16px; + background-position: -176px 0; +} +.ckan-icon-callout { + width: 16px; + height: 16px; + background-position: -192px 0; +} +.ckan-icon-circle-cross { + width: 17px; + height: 17px; + background-position: 0px -16px; +} +.ckan-icon-circle-add { + width: 17px; + height: 17px; + background-position: -17px -16px; +} +.ckan-icon-flame { + width: 17px; + height: 17px; + background-position: -34px -16px; +} +.ckan-icon-search { + width: 17px; + height: 17px; + background-position: -51px -16px; +} +.ckan-icon-large-lock { + width: 20px; + height: 20px; + background-position: 0px -33px; +} +.ckan-icon-photo { + width: 20px; + height: 20px; + background-position: -20px -33px; +} +.ckan-icon-add { + width: 20px; + height: 20px; + background-position: -40px -33px; +} +.ckan-icon-home { + width: 20px; + height: 20px; + background-position: -60px -33px; +} +.ckan-icon-rewind { + width: 20px; + height: 20px; + background-position: -80px -33px; +} +.ckan-icon-tools { + width: 20px; + height: 20px; + background-position: -100px -33px; +} +.ckan-icon-flag { + width: 20px; + height: 20px; + background-position: -120px -33px; +} +.ckan-icon-clipboard { + width: 20px; + height: 20px; + background-position: -140px -33px; +} +.ckan-icon-share { + width: 20px; + height: 20px; + background-position: -160px -33px; +} +.ckan-icon-info { + width: 20px; + height: 20px; + background-position: -180px -33px; +} +.ckan-icon-download { + width: 20px; + height: 20px; + background-position: -200px -33px; +} +.ckan-icon-star { + width: 20px; + height: 20px; + background-position: -220px -33px; +} +.ckan-icon-info-flat { + width: 20px; + height: 20px; + background-position: -240px -33px; +} +.ckan-icon-tag { + width: 20px; + height: 20px; + background-position: -260px -33px; +} +.ckan-icon-plus { + width: 20px; + height: 20px; + background-position: -280px -33px; + width: 16px; +} +.ckan-icon-head { + width: 20px; + height: 20px; + background-position: -300px -33px; +} +.ckan-icon-arrow-e { + width: 20px; + height: 20px; + background-position: -320px -33px; + width: 16px; +} +.ckan-icon-bookmark { + width: 25px; + height: 25px; + background-position: 0px -53px; +} +.format-label { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + text-indent: -900em; + background: url("../../../base/images/sprite-resource-icons.png") no-repeat 0 0; +} +.format-label { + width: 32px; + height: 35px; + background-position: 0px -62px; +} +.format-label[data-format=rdf], +.format-label[data-format*=rdf] { + width: 32px; + height: 35px; + background-position: -32px -62px; +} +.format-label[data-format=pdf], +.format-label[data-format*=pdf] { + width: 32px; + height: 35px; + background-position: -64px -62px; +} +.format-label[data-format=api], +.format-label[data-format*=api] { + width: 32px; + height: 35px; + background-position: -96px -62px; +} +.format-label[data-format=zip], +.format-label[data-format*=zip] { + width: 32px; + height: 35px; + background-position: -128px -62px; +} +.format-label[data-format=xls], +.format-label[data-format*=xls] { + width: 32px; + height: 35px; + background-position: -160px -62px; +} +.format-label[data-format=csv], +.format-label[data-format*=csv] { + width: 32px; + height: 35px; + background-position: -192px -62px; +} +.format-label[data-format=txt], +.format-label[data-format*=txt] { + width: 32px; + height: 35px; + background-position: -224px -62px; +} +.format-label[data-format=xml], +.format-label[data-format*=xml] { + width: 32px; + height: 35px; + background-position: -256px -62px; +} +.format-label[data-format=json], +.format-label[data-format*=json] { + width: 32px; + height: 35px; + background-position: -288px -62px; +} +.format-label[data-format=html], +.format-label[data-format*=html] { + width: 32px; + height: 35px; + background-position: -320px -62px; +} +/* This is a modified version of the font-awesome core less document. */ +@font-face { + font-family: 'FontAwesome'; + src: url('../../../base/vendor/font-awesome/font/fontawesome-webfont.eot?v=3.0.1'); + src: url('../../../base/vendor/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.0.1') format('embedded-opentype'), url('../../../base/vendor/font-awesome/font/fontawesome-webfont.woff?v=3.0.1') format('woff'), url('../../../base/vendor/font-awesome/font/fontawesome-webfont.ttf?v=3.0.1') format('truetype'); + font-weight: normal; + font-style: normal; +} +[class^="icon-"], +[class*=" icon-"] { + font-family: FontAwesome; + font-weight: normal; + font-style: normal; + text-decoration: inherit; + -webkit-font-smoothing: antialiased; + display: inline; width: auto; - border: 1px solid #cccccc; - border-top: none; - font-size: 11px; - color: #282828; + height: auto; + line-height: normal; + vertical-align: baseline; + background-image: none; + background-position: 0% 0%; + background-repeat: repeat; + margin-top: 0; } -.editor .editor-info-block a { - color: #045b04; - text-decoration: none; +.icon-spin { + display: inline-block; + -moz-animation: spin 2s infinite linear; + -o-animation: spin 2s infinite linear; + -webkit-animation: spin 2s infinite linear; + animation: spin 2s infinite linear; +} +@-moz-keyframes spin { + 0% { + -moz-transform: rotate(0deg); + } + 100% { + -moz-transform: rotate(359deg); + } } -.control-custom { - font-size: 0; +@-webkit-keyframes spin { + 0% { + -webkit-transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + } } -.control-custom label { - margin-bottom: 0; +@-o-keyframes spin { + 0% { + -o-transform: rotate(0deg); + } + 100% { + -o-transform: rotate(359deg); + } } -.control-custom input { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - width: 140px; +@-ms-keyframes spin { + 0% { + -ms-transform: rotate(0deg); + } + 100% { + -ms-transform: rotate(359deg); + } } -.control-custom input:last-of-type { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; +@keyframes spin { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(359deg); + } } -.control-custom .checkbox { - display: inline-block; - margin-left: 5px; +@-moz-document url-prefix() { + .icon-spin { + height: .9em; + } + .btn .icon-spin { + height: auto; + } + .icon-spin.icon-large { + height: 1.25em; + } + .btn .icon-spin.icon-large { + height: .75em; + } } -.control-custom .checkbox input { - width: auto; +/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen + readers do not read off random characters that represent icons */ +.icon-glass:before { + content: "\f000"; } -.control-custom.disabled label, -.control-custom.disabled input { - color: #aaaaaa; - text-decoration: line-through; - text-shadow: none; +.icon-music:before { + content: "\f001"; } -.control-custom.disabled input { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - background-color: #f3f3f3; +.icon-search:before { + content: "\f002"; } -.control-custom.disabled .checkbox { - color: #4d4d4d; - text-decoration: none; +.icon-envelope:before { + content: "\f003"; } -.control-custom .checkbox.btn { - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; - position: relative; - top: 0; - left: 5px; - height: 3px; - width: 8px; - padding: 3px 8px; +.icon-heart:before { + content: "\f004"; } -.control-custom .checkbox.btn span { - display: none; - width: 30px; +.icon-star:before { + content: "\f005"; } -.control-custom .checkbox.btn:before { - position: relative; - top: 1px; - left: -1px; - color: #fff; +.icon-star-empty:before { + content: "\f006"; } -.control-custom .checkbox.btn input { - display: none; +.icon-user:before { + content: "\f007"; } -.control-custom.disabled .checkbox.btn { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #099f33; - background-image: -moz-linear-gradient(top, #0acf0a, #085871); - background-image: -ms-linear-gradient(top, #0acf0a, #085871); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0acf0a), to(#085871)); - background-image: -webkit-linear-gradient(top, #0acf0a, #085871); - background-image: -o-linear-gradient(top, #0acf0a, #085871); - background-image: linear-gradient(top, #0acf0a, #085871); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0acf0a', endColorstr='#085871', GradientType=0); - border-color: #085871 #085871 #03202a; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #085871; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-film:before { + content: "\f008"; } -.control-custom.disabled .checkbox.btn:hover, -.control-custom.disabled .checkbox.btn:active, -.control-custom.disabled .checkbox.btn.active, -.control-custom.disabled .checkbox.btn.disabled, -.control-custom.disabled .checkbox.btn[disabled] { - background-color: #085871; - *background-color: #064559; +.icon-th-large:before { + content: "\f009"; } -.control-custom.disabled .checkbox.btn:active, -.control-custom.disabled .checkbox.btn.active { - background-color: #053341 \9; +.icon-th:before { + content: "\f00a"; } -.control-custom.disabled .checkbox.btn .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-th-list:before { + content: "\f00b"; } -.alert-danger a, -.alert-error a { - color: #b55457; +.icon-ok:before { + content: "\f00c"; } -.control-group.error input, -.control-group.error select, -.control-group.error textarea, -.control-group.error .input-prepend .add-on, -.control-group.error .input-append .add-on { - border-color: #c6898b; +.icon-remove:before { + content: "\f00d"; } -.error-inline { - color: #b55457; +.icon-zoom-in:before { + content: "\f00e"; } -.error-block, -.error-inline { - font-size: 12px; +.icon-zoom-out:before { + content: "\f010"; } -.error-block { - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - display: block; - padding: 6px 8px 3px; - background: #c6898b; - margin: -3px 0 0; - color: #ffffff; - width: 216px; +.icon-off:before { + content: "\f011"; } -.control-medium .error-block { - width: 326px; +.icon-signal:before { + content: "\f012"; } -.control-full .error-block { - width: auto; +.icon-cog:before { + content: "\f013"; } -.control-group.error .input-prepend .error-block, -.control-custom.error .error-block { - margin-left: -1px; - width: auto; +.icon-trash:before { + content: "\f014"; } -.control-custom.error .error-block { - width: 409px; +.icon-home:before { + content: "\f015"; } -.control-select.error .error-block { - width: 204px; +.icon-file:before { + content: "\f016"; } -.stages { - margin: 0; - list-style: none; - *zoom: 1; - color: #aeaeae; - counter-reset: stage; - margin: -20px -25px 20px; - overflow: hidden; +.icon-time:before { + content: "\f017"; } -.stages:before, -.stages:after { - display: table; - content: ""; +.icon-road:before { + content: "\f018"; } -.stages:after { - clear: both; +.icon-download-alt:before { + content: "\f019"; } -.stages li { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - line-height: 27px; - counter-increment: stage; - width: 33.33%; - background-color: #ededed; - float: left; - padding: 10px 20px; - position: relative; - z-index: 0; +.icon-download:before { + content: "\f01a"; } -.stages li:before { - -webkit-border-radius: 14px; - -moz-border-radius: 14px; - border-radius: 14px; - content: counter(stage); - display: inline-block; - width: 27px; - height: 27px; - margin-right: 5px; - font-weight: bold; - text-align: center; - color: #ffffff; - background-color: #aeaeae; - z-index: 1; +.icon-upload:before { + content: "\f01b"; +} +.icon-inbox:before { + content: "\f01c"; +} +.icon-play-circle:before { + content: "\f01d"; +} +.icon-repeat:before { + content: "\f01e"; +} +/* \f020 doesn't work in Safari. all shifted one down */ +.icon-refresh:before { + content: "\f021"; +} +.icon-list-alt:before { + content: "\f022"; +} +.icon-lock:before { + content: "\f023"; +} +.icon-flag:before { + content: "\f024"; +} +.icon-headphones:before { + content: "\f025"; +} +.icon-volume-off:before { + content: "\f026"; +} +.icon-volume-down:before { + content: "\f027"; +} +.icon-volume-up:before { + content: "\f028"; +} +.icon-qrcode:before { + content: "\f029"; +} +.icon-barcode:before { + content: "\f02a"; } -.stages li:after { - left: 0; - border: solid rgba(237, 237, 237, 0); - content: " "; - height: 0; - width: 0; - position: absolute; - pointer-events: none; - border-top-color: #ededed; - border-bottom-color: #ededed; - border-width: 29px; - top: 50%; - margin-top: -29px; - margin-left: -30px; +.icon-tag:before { + content: "\f02b"; } -.stages li.first, -.stages li.first .highlight { - -webkit-border-radius: 3px 0 0 0; - -moz-border-radius: 3px 0 0 0; - border-radius: 3px 0 0 0; +.icon-tags:before { + content: "\f02c"; } -.stages li.last { - position: relative; - right: -1px; +.icon-book:before { + content: "\f02d"; } -.stages li.last, -.stages li.last .highlight { - -webkit-border-radius: 0 3px 0 0; - -moz-border-radius: 0 3px 0 0; - border-radius: 0 3px 0 0; +.icon-bookmark:before { + content: "\f02e"; } -.stages li.first:after { - content: none; - border: none; +.icon-print:before { + content: "\f02f"; } -.stages li.active:after { - border-color: rgba(140, 198, 138, 0); - border-top-color: #8cc68a; - border-bottom-color: #8cc68a; +.icon-camera:before { + content: "\f030"; } -.stages li.complete:after { - border-color: rgba(197, 226, 196, 0); - border-top-color: #c5e2c4; - border-bottom-color: #c5e2c4; +.icon-font:before { + content: "\f031"; } -.stages.stage-3 li.complete:first-child:after { - content: none; +.icon-bold:before { + content: "\f032"; } -.stages li.active, -.stages li.complete { - background: none; +.icon-italic:before { + content: "\f033"; } -.stages li.active:before { - color: #8cc68a; - background: #ffffff; +.icon-text-height:before { + content: "\f034"; } -.stages li.complete:before { - color: #c5e2c4; - background: #eef6ed; +.icon-text-width:before { + content: "\f035"; } -.stages li .highlight { - display: block; - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - width: 100%; - padding: 10px 52px; - border: none; - text-align: left; - text-decoration: none; - line-height: 27px; - z-index: -1; +.icon-align-left:before { + content: "\f036"; } -.stages li.active .highlight { - color: #ffffff; - background: #8cc68a; +.icon-align-center:before { + content: "\f037"; } -.stages li.complete .highlight { - color: #eef6ed; - background: #c5e2c4; +.icon-align-right:before { + content: "\f038"; } -.alert > :last-child { - margin-bottom: 0; +.icon-align-justify:before { + content: "\f039"; } -.slug-preview { - font-size: 14px; - line-height: 1.5; - margin-top: 5px; - margin-left: 10px; +.icon-list:before { + content: "\f03a"; } -.slug-preview-value { - background-color: #faedcf; - margin-right: 3px; +.icon-indent-left:before { + content: "\f03b"; } -.slug-preview .btn { - padding-top: 3px; - padding-bottom: 3px; +.icon-indent-right:before { + content: "\f03c"; } -.resource-upload-field { - position: relative; - overflow: hidden; - display: inline-block; - vertical-align: bottom; +.icon-facetime-video:before { + content: "\f03d"; } -.resource-upload-field label { - z-index: 0; +.icon-picture:before { + content: "\f03e"; } -.resource-upload-field input { - opacity: 0; - filter: alpha(opacity=0); - position: absolute; - top: 0; - right: 0; - z-index: 1; - margin: 0; - border: solid transparent; - border-width: 100px 0 0 200px; - cursor: pointer; - direction: ltr; - -moz-transform: translate(-300px, 0) scale(4); +.icon-pencil:before { + content: "\f040"; } -.resource-upload-field.loading { - display: inline-block; - background: url("../../../base/images/loading-spinner.gif") no-repeat center right; - padding-right: 5px; +.icon-map-marker:before { + content: "\f041"; } -.select2-container .select2-choice input, -.select2-container-multi .select2-choices .select2-search-field:first-child input { - font-size: 14px; +.icon-adjust:before { + content: "\f042"; } -.select2-container-multi .select2-choices .select2-search-field input { - height: 29px; +.icon-tint:before { + content: "\f043"; } -.select2-container .select2-choice input, -.select2-container-multi .select2-choices .select2-search-field:first-child input { - padding-left: 10px; +.icon-edit:before { + content: "\f044"; } -.select2-container { - margin-top: 5px; +.icon-share:before { + content: "\f045"; } -.select2-container-multi { - margin-top: 0; +.icon-check:before { + content: "\f046"; } -.select2-container-multi .select2-choices .select2-search-choice { - padding: 5px 8px 5px 22px; +.icon-move:before { + content: "\f047"; } -.select2-container-multi.select2-container .select2-choices { - padding-top: 3px; - padding-bottom: 3px; +.icon-step-backward:before { + content: "\f048"; } -.select2-search-choice-close, -.select2-container-multi .select2-search-choice-close { - top: 6px; - left: 5px; +.icon-fast-backward:before { + content: "\f049"; } -.select2-container-multi .select2-choices { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; - background-color: #ffffff; - border: 1px solid #cccccc; +.icon-backward:before { + content: "\f04a"; } -.select2-container-active .select2-choices, -.select2-container-multi.select2-container-active .select2-choices { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); +.icon-play:before { + content: "\f04b"; } -.select2-container-multi .select2-drop { - margin-top: -2px; +.icon-pause:before { + content: "\f04c"; } -.select2-container .select2-results li { - line-height: 18px; - padding-top: 4px; - padding-bottom: 4px; +.icon-stop:before { + content: "\f04d"; } -.control-full .select2-container { - width: 520px !important; +.icon-forward:before { + content: "\f04e"; } -.dataset-item { - border-bottom: 1px dotted #cccccc; - padding-bottom: 20px; - margin-bottom: 20px; +.icon-fast-forward:before { + content: "\f050"; } -.dataset-item:last-of-type { - border-bottom: none; - margin-bottom: 0; - padding-bottom: 0; +.icon-step-forward:before { + content: "\f051"; } -.dataset-heading { - font-size: 14px; - line-height: 1.3; +.icon-eject:before { + content: "\f052"; } -.dataset-heading a { - color: #333333; +.icon-chevron-left:before { + content: "\f053"; +} +.icon-chevron-right:before { + content: "\f054"; +} +.icon-plus-sign:before { + content: "\f055"; +} +.icon-minus-sign:before { + content: "\f056"; +} +.icon-remove-sign:before { + content: "\f057"; } -.dataset-heading .label { - position: relative; - top: -1px; +.icon-ok-sign:before { + content: "\f058"; } -.dataset-content { - font-size: 12px; +.icon-question-sign:before { + content: "\f059"; } -.dataset-resources { - font-size: 10px; - line-height: 14px; - margin-top: 5px; +.icon-info-sign:before { + content: "\f05a"; } -.dataset-resources li { - display: inline; +.icon-screenshot:before { + content: "\f05b"; } -.dataset-resources li a { - background-color: #aaaaaa; +.icon-remove-circle:before { + content: "\f05c"; } -.dataset-heading .popular { - top: 0; +.icon-ok-circle:before { + content: "\f05d"; } -.results { - margin-bottom: 20px; - padding-bottom: 25px; - border-bottom: 1px dotted #cccccc; +.icon-ban-circle:before { + content: "\f05e"; } -.results strong { - display: block; - font-size: 24px; - line-height: 1.3; - color: #000000; - margin-bottom: 10px; +.icon-arrow-left:before { + content: "\f060"; } -.results strong:before { - float: right; - content: " "; - width: 280px; - white-space: pre; +.icon-arrow-right:before { + content: "\f061"; } -.filter-list { - color: #4d4d4d; - font-weight: bold; +.icon-arrow-up:before { + content: "\f062"; } -.filter-list .extra { - margin-top: 10px; - font-size: 18px; - font-weight: normal; - color: #000000; +.icon-arrow-down:before { + content: "\f063"; } -.dataset-search { - position: relative; +.icon-share-alt:before { + content: "\f064"; } -.search-giant { - position: relative; +.icon-resize-full:before { + content: "\f065"; } -.search-giant input { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - font-size: 16px; - padding: 14px 10px; - width: 100%; - height: auto; +.icon-resize-small:before { + content: "\f066"; } -.search-giant button { - cursor: pointer; - position: absolute; - right: 15px; - top: 50%; - display: block; - border: none; - padding: 0; - margin-top: -17px; - width: 30px; - height: 30px; - background: transparent url("../../../base/images/icon-search-27x26.png") no-repeat center center; - text-indent: -900em; +.icon-plus:before { + content: "\f067"; } -.control-order-by { - position: absolute; - bottom: -65px; - right: 0; +.icon-minus:before { + content: "\f068"; } -.control-order-by label, -.control-order-by select { - display: inline; +.icon-asterisk:before { + content: "\f069"; } -.control-order-by select { - width: 160px; +.icon-exclamation-sign:before { + content: "\f06a"; } -.resource-list { - margin: 0; - list-style: none; - margin: -10px -10px 10px -10px; +.icon-gift:before { + content: "\f06b"; } -.resource-item { - position: relative; - padding: 10px 110px 10px 60px; - margin-bottom: 0px; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; +.icon-leaf:before { + content: "\f06c"; } -.resource-item:hover { - background-color: #efefef; +.icon-fire:before { + content: "\f06d"; } -.resource-item .heading { - color: #000000; - font-size: 14px; - font-weight: bold; +.icon-eye-open:before { + content: "\f06e"; } -.resource-item .format-label { - position: absolute; - top: 10px; - left: 10px; +.icon-eye-close:before { + content: "\f070"; } -.resource-item .description { - font-size: 12px; - margin-bottom: 0; +.icon-warning-sign:before { + content: "\f071"; } -.resource-item .btn-group { - position: absolute; - top: 13px; - right: 10px; +.icon-plane:before { + content: "\f072"; } -.dataset-resource-form .dataset-form-resource-types { - margin-bottom: 5px; +.icon-calendar:before { + content: "\f073"; } -.dataset-form-resource-types .ckan-icon { - position: relative; - top: 3px; +.icon-random:before { + content: "\f074"; } -.dataset-form-resource-types .radio { - font-weight: normal; - padding-left: 0; - padding-right: 18px; +.icon-comment:before { + content: "\f075"; } -.dataset-form-resource-types label { - position: relative; +.icon-magnet:before { + content: "\f076"; } -.dataset-form-resource-types input[type=radio]:checked + label { - font-weight: bold; +.icon-chevron-up:before { + content: "\f077"; } -.dataset-form-resource-types input[type=radio]:checked + label:after { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - width: 16px; - height: 16px; - background-position: -192px 0; - display: block; - content: ""; - position: absolute; - top: auto; - left: 0; - bottom: -12px; +.icon-chevron-down:before { + content: "\f078"; } -.dataset-form-resource-types input[type=radio]:checked + label:after:last-child { - *margin-left: 0; +.icon-retweet:before { + content: "\f079"; } -.dataset-form-resource-types input[type=radio] { - display: none; +.icon-shopping-cart:before { + content: "\f07a"; } -.tag-list { - margin: 0; - list-style: none; - padding: 10px; +.icon-folder-close:before { + content: "\f07b"; } -.tag-list li { - display: inline-block; - margin-right: 5px; +.icon-folder-open:before { + content: "\f07c"; } -.tag-list li:last-child { - margin-right: 0; +.icon-resize-vertical:before { + content: "\f07d"; } -.additional-info td, -.additional-info th { - width: 50%; +.icon-resize-horizontal:before { + content: "\f07e"; } -.label[data-format=html], -.label[data-format*=html] { - background-color: #55a1ce; +.icon-bar-chart:before { + content: "\f080"; } -.label[data-format=json], -.label[data-format*=json] { - background-color: #ef7100; +.icon-twitter-sign:before { + content: "\f081"; } -.label[data-format=xml], -.label[data-format*=xml] { - background-color: #ef7100; +.icon-facebook-sign:before { + content: "\f082"; } -.label[data-format=text], -.label[data-format*=text] { - background-color: #74cbec; +.icon-camera-retro:before { + content: "\f083"; } -.label[data-format=csv], -.label[data-format*=csv] { - background-color: #dfb100; +.icon-key:before { + content: "\f084"; } -.label[data-format=xls], -.label[data-format*=xls] { - background-color: #2db55d; +.icon-cogs:before { + content: "\f085"; } -.label[data-format=zip], -.label[data-format*=zip] { - background-color: #686868; +.icon-comments:before { + content: "\f086"; } -.label[data-format=api], -.label[data-format*=api] { - background-color: #ec96be; +.icon-thumbs-up:before { + content: "\f087"; } -.label[data-format=pdf], -.label[data-format*=pdf] { - background-color: #e0051e; +.icon-thumbs-down:before { + content: "\f088"; } -.label[data-format=rdf], -.label[data-format*=rdf], -.label[data-format*=nquad], -.label[data-format*=ntriples], -.label[data-format*=turtle] { - background-color: #0b4498; +.icon-star-half:before { + content: "\f089"; } -.group .media-vertical .image { - margin: 0 -5px 5px; +.icon-heart-empty:before { + content: "\f08a"; } -.group-list:nth-child(odd) { - clear: left; +.icon-signout:before { + content: "\f08b"; } -.group-list .module-heading { - padding-top: 15px; - padding-bottom: 15px; +.icon-linkedin-sign:before { + content: "\f08c"; } -.group-list .dataset-content { - min-height: 54px; +.icon-pushpin:before { + content: "\f08d"; } -.group-list .module-heading h3 { - margin-bottom: 2px; +.icon-external-link:before { + content: "\f08e"; } -.group-list .module-heading h3 a { - color: #333333; +.icon-signin:before { + content: "\f090"; } -.toolbar { - *zoom: 1; - margin-top: -10px; - margin-bottom: 10px; - padding: 5px 0; +.icon-trophy:before { + content: "\f091"; } -.toolbar:before, -.toolbar:after { - display: table; - content: ""; +.icon-github-sign:before { + content: "\f092"; } -.toolbar:after { - clear: both; +.icon-upload-alt:before { + content: "\f093"; } -.toolbar .breadcrumb { - *zoom: 1; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - position: relative; - float: left; - margin: 0; - padding: 0; - border: none; - background: none; - font-size: 20px; +.icon-lemon:before { + content: "\f094"; } -.toolbar .breadcrumb:before, -.toolbar .breadcrumb:after { - display: table; - content: ""; +.icon-phone:before { + content: "\f095"; } -.toolbar .breadcrumb:after { - clear: both; +.icon-check-empty:before { + content: "\f096"; } -.toolbar li [class^=icon]:before { - width: auto; +.icon-bookmark-empty:before { + content: "\f097"; } -.toolbar .breadcrumb li:after { - content: " / "; +.icon-phone-sign:before { + content: "\f098"; } -.toolbar .breadcrumb li.active:after { - content: ""; +.icon-twitter:before { + content: "\f099"; } -.toolbar .breadcrumb li:last-of-type:after { - content: ""; +.icon-facebook:before { + content: "\f09a"; } -.toolbar .home a { - text-decoration: none; +.icon-github:before { + content: "\f09b"; } -.toolbar .home span { - display: none; +.icon-unlock:before { + content: "\f09c"; } -.toolbar .breadcrumb a { - color: #505050; - line-height: 28px; +.icon-credit-card:before { + content: "\f09d"; } -.toolbar .breadcrumb .active a { - font-weight: bold; +.icon-rss:before { + content: "\f09e"; } -.toolbar .actions { - margin: 0; - list-style: none; +.icon-hdd:before { + content: "\f0a0"; } -.toolbar .actions li { - display: inline-block; - margin-right: 5px; +.icon-bullhorn:before { + content: "\f0a1"; } -.toolbar .actions li { - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; +.icon-bell:before { + content: "\f0a2"; } -.toolbar .actions li:last-of-type { - margin-right: 0; +.icon-certificate:before { + content: "\f0a3"; } -.toolbar .btn { - padding: 0 10px 0 8px; - border-color: #b7b7b7; - line-height: 27px; +.icon-hand-right:before { + content: "\f0a4"; } -.toolbar .btn-success { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(top, #62c462, #51a351); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); - border-color: #51a351 #51a351 #387038; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #51a351; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-hand-left:before { + content: "\f0a5"; } -.toolbar .btn-success:hover, -.toolbar .btn-success:active, -.toolbar .btn-success.active, -.toolbar .btn-success.disabled, -.toolbar .btn-success[disabled] { - background-color: #51a351; - *background-color: #499249; +.icon-hand-up:before { + content: "\f0a6"; } -.toolbar .btn-success:active, -.toolbar .btn-success.active { - background-color: #408140 \9; +.icon-hand-down:before { + content: "\f0a7"; } -.toolbar .btn-success .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-circle-arrow-left:before { + content: "\f0a8"; } -.toolbar .btn-primary { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #099f33; - background-image: -moz-linear-gradient(top, #0acf0a, #085871); - background-image: -ms-linear-gradient(top, #0acf0a, #085871); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0acf0a), to(#085871)); - background-image: -webkit-linear-gradient(top, #0acf0a, #085871); - background-image: -o-linear-gradient(top, #0acf0a, #085871); - background-image: linear-gradient(top, #0acf0a, #085871); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0acf0a', endColorstr='#085871', GradientType=0); - border-color: #085871 #085871 #03202a; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #085871; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-circle-arrow-right:before { + content: "\f0a9"; } -.toolbar .btn-primary:hover, -.toolbar .btn-primary:active, -.toolbar .btn-primary.active, -.toolbar .btn-primary.disabled, -.toolbar .btn-primary[disabled] { - background-color: #085871; - *background-color: #064559; +.icon-circle-arrow-up:before { + content: "\f0aa"; } -.toolbar .btn-primary:active, -.toolbar .btn-primary.active { - background-color: #053341 \9; +.icon-circle-arrow-down:before { + content: "\f0ab"; } -.toolbar .btn-primary .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-globe:before { + content: "\f0ac"; } -.toolbar .btn-warning { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #faa732; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(top, #fbb450, #f89406); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); - border-color: #f89406 #f89406 #ad6704; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #f89406; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-wrench:before { + content: "\f0ad"; } -.toolbar .btn-warning:hover, -.toolbar .btn-warning:active, -.toolbar .btn-warning.active, -.toolbar .btn-warning.disabled, -.toolbar .btn-warning[disabled] { - background-color: #f89406; - *background-color: #df8505; +.icon-tasks:before { + content: "\f0ae"; } -.toolbar .btn-warning:active, -.toolbar .btn-warning.active { - background-color: #c67605 \9; +.icon-filter:before { + content: "\f0b0"; } -.toolbar .btn-warning .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-briefcase:before { + content: "\f0b1"; } -.toolbar .btn-danger { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #da4f49; - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(top, #ee5f5b, #bd362f); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); - border-color: #bd362f #bd362f #802420; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #bd362f; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-fullscreen:before { + content: "\f0b2"; } -.toolbar .btn-danger:hover, -.toolbar .btn-danger:active, -.toolbar .btn-danger.active, -.toolbar .btn-danger.disabled, -.toolbar .btn-danger[disabled] { - background-color: #bd362f; - *background-color: #a9302a; +.icon-group:before { + content: "\f0c0"; } -.toolbar .btn-danger:active, -.toolbar .btn-danger.active { - background-color: #942a25 \9; +.icon-link:before { + content: "\f0c1"; } -.toolbar .btn-danger .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-cloud:before { + content: "\f0c2"; } -.toolbar .btn-success { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(top, #62c462, #51a351); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); - border-color: #51a351 #51a351 #387038; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #51a351; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-beaker:before { + content: "\f0c3"; } -.toolbar .btn-success:hover, -.toolbar .btn-success:active, -.toolbar .btn-success.active, -.toolbar .btn-success.disabled, -.toolbar .btn-success[disabled] { - background-color: #51a351; - *background-color: #499249; +.icon-cut:before { + content: "\f0c4"; } -.toolbar .btn-success:active, -.toolbar .btn-success.active { - background-color: #408140 \9; +.icon-copy:before { + content: "\f0c5"; } -.toolbar .btn-success .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-paper-clip:before { + content: "\f0c6"; } -.toolbar .btn-info { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #49afcd; - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); - background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(top, #5bc0de, #2f96b4); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); - border-color: #2f96b4 #2f96b4 #1f6377; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #2f96b4; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-save:before { + content: "\f0c7"; +} +.icon-sign-blank:before { + content: "\f0c8"; } -.toolbar .btn-info:hover, -.toolbar .btn-info:active, -.toolbar .btn-info.active, -.toolbar .btn-info.disabled, -.toolbar .btn-info[disabled] { - background-color: #2f96b4; - *background-color: #2a85a0; +.icon-reorder:before { + content: "\f0c9"; } -.toolbar .btn-info:active, -.toolbar .btn-info.active { - background-color: #24748c \9; +.icon-list-ul:before { + content: "\f0ca"; } -.toolbar .btn-info .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-list-ol:before { + content: "\f0cb"; } -.toolbar .btn-inverse { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #414141; - background-image: -moz-linear-gradient(top, #555555, #222222); - background-image: -ms-linear-gradient(top, #555555, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); - background-image: -webkit-linear-gradient(top, #555555, #222222); - background-image: -o-linear-gradient(top, #555555, #222222); - background-image: linear-gradient(top, #555555, #222222); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); - border-color: #222222 #222222 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #222222; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-strikethrough:before { + content: "\f0cc"; } -.toolbar .btn-inverse:hover, -.toolbar .btn-inverse:active, -.toolbar .btn-inverse.active, -.toolbar .btn-inverse.disabled, -.toolbar .btn-inverse[disabled] { - background-color: #222222; - *background-color: #151515; +.icon-underline:before { + content: "\f0cd"; } -.toolbar .btn-inverse:active, -.toolbar .btn-inverse.active { - background-color: #080808 \9; +.icon-table:before { + content: "\f0ce"; } -.toolbar .btn-inverse .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-magic:before { + content: "\f0d0"; } -.hide-heading { - display: none; +.icon-truck:before { + content: "\f0d1"; } -.page-header { - position: relative; - border-bottom: 1px solid #d0d0d0; - height: 30px; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - background-color: #f3f3f3; - background-image: -moz-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -ms-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f0f0f0)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -o-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: linear-gradient(top, #f5f5f5, #f0f0f0); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f0f0f0', GradientType=0); +.icon-pinterest:before { + content: "\f0d2"; } -.page-header .nav-tabs { - position: absolute; - left: 20px; - bottom: -1px; - margin-bottom: 0; +.icon-pinterest-sign:before { + content: "\f0d3"; } -.page-header .nav-tabs i { - margin-right: 10px; - font-size: 14px; +.icon-google-plus-sign:before { + content: "\f0d4"; } -.page-header .nav-tabs a:hover { - background-color: #ffffff; +.icon-google-plus:before { + content: "\f0d5"; } -.prose h1, -.prose heading-1 h2, -.prose heading-2 { - margin-bottom: 15px; +.icon-money:before { + content: "\f0d6"; } -.prose h3, -.prose heading-3 { - margin-bottom: 10px; +.icon-caret-down:before { + content: "\f0d7"; } -.table-chunky td, -.table-chunky th { - padding: 12px 15px; - font-size: 12px; +.icon-caret-up:before { + content: "\f0d8"; } -.table-chunky thead th, -.table-chunky thead td { - color: #ffffff; - background-color: #aaaaaa; - padding-top: 10px; - padding-bottom: 10px; +.icon-caret-left:before { + content: "\f0d9"; } -.table-striped tbody tr:nth-child(odd) td, -.table-striped tbody tr:nth-child(odd) th { - background-color: transparent; +.icon-caret-right:before { + content: "\f0da"; } -.table-striped tbody tr:nth-child(even) td, -.table-striped tbody tr:nth-child(even) th { - background-color: #f2f2f2; +.icon-columns:before { + content: "\f0db"; } -.table-chunky.table-bordered { - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; +.icon-sort:before { + content: "\f0dc"; } -.table-chunky.table-bordered thead:first-child tr:first-child th:first-child, -.table-chunky.table-bordered tbody:first-child tr:first-child td:first-child { - -webkit-border-top-left-radius: 2px; - -moz-border-radius-topleft: 2px; - border-top-left-radius: 2px; +.icon-sort-down:before { + content: "\f0dd"; } -.table-chunky.table-bordered thead:first-child tr:first-child th:last-child, -.table-chunky.table-bordered tbody:first-child tr:first-child td:last-child { - -webkit-border-top-right-radius: 2px; - -moz-border-radius-topright: 2px; - border-top-right-radius: 2px; +.icon-sort-up:before { + content: "\f0de"; } -.table-chunky.table-bordered thead:last-child tr:last-child th:first-child, -.table-chunky.table-bordered tbody:last-child tr:last-child td:first-child { - -webkit-border-radius: 0 0 0 2px; - -moz-border-radius: 0 0 0 2px; - border-radius: 0 0 0 2px; - -webkit-border-bottom-left-radius: 2px; - -moz-border-radius-bottomleft: 2px; - border-bottom-left-radius: 2px; +.icon-envelope-alt:before { + content: "\f0e0"; } -.table-chunky.table-bordered thead:last-child tr:last-child th:last-child, -.table-chunky.table-bordered tbody:last-child tr:last-child td:last-child { - -webkit-border-bottom-right-radius: 2px; - -moz-border-radius-bottomright: 2px; - border-bottom-right-radius: 2px; +.icon-linkedin:before { + content: "\f0e1"; } -.ckan-icon { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; +.icon-undo:before { + content: "\f0e2"; } -.ckan-icon:last-child { - *margin-left: 0; +.icon-legal:before { + content: "\f0e3"; } -.ckan-icon-fb { - width: 16px; - height: 16px; - background-position: 0px 0; +.icon-dashboard:before { + content: "\f0e4"; } -.ckan-icon-gplus { - width: 16px; - height: 16px; - background-position: -16px 0; +.icon-comment-alt:before { + content: "\f0e5"; } -.ckan-icon-twitter { - width: 16px; - height: 16px; - background-position: -32px 0; +.icon-comments-alt:before { + content: "\f0e6"; } -.ckan-icon-email { - width: 16px; - height: 16px; - background-position: -48px 0; +.icon-bolt:before { + content: "\f0e7"; } -.ckan-icon-share { - width: 16px; - height: 16px; - background-position: -64px 0; +.icon-sitemap:before { + content: "\f0e8"; } -.ckan-icon-feed { - width: 16px; - height: 16px; - background-position: -80px 0; +.icon-umbrella:before { + content: "\f0e9"; } -.ckan-icon-calendar { - width: 16px; - height: 16px; - background-position: -96px 0; +.icon-paste:before { + content: "\f0ea"; } -.ckan-icon-file { - width: 16px; - height: 16px; - background-position: -112px 0; +.icon-lightbulb:before { + content: "\f0eb"; } -.ckan-icon-lock { - width: 16px; - height: 16px; - background-position: -128px 0; +.icon-exchange:before { + content: "\f0ec"; } -.ckan-icon-link-file { - width: 16px; - height: 16px; - background-position: -144px 0; +.icon-cloud-download:before { + content: "\f0ed"; } -.ckan-icon-link-plugin { - width: 16px; - height: 16px; - background-position: -160px 0; +.icon-cloud-upload:before { + content: "\f0ee"; } -.ckan-icon-upload-file { - width: 16px; - height: 16px; - background-position: -176px 0; +.icon-user-md:before { + content: "\f0f0"; } -.ckan-icon-callout { - width: 16px; - height: 16px; - background-position: -192px 0; +.icon-stethoscope:before { + content: "\f0f1"; } -.ckan-icon-circle-cross { - width: 17px; - height: 17px; - background-position: 0px -16px; +.icon-suitcase:before { + content: "\f0f2"; } -.ckan-icon-circle-add { - width: 17px; - height: 17px; - background-position: -17px -16px; +.icon-bell-alt:before { + content: "\f0f3"; } -.ckan-icon-flame { - width: 17px; - height: 17px; - background-position: -34px -16px; +.icon-coffee:before { + content: "\f0f4"; } -.ckan-icon-search { - width: 17px; - height: 17px; - background-position: -51px -16px; +.icon-food:before { + content: "\f0f5"; } -.ckan-icon-large-lock { - width: 20px; - height: 20px; - background-position: 0px -33px; +.icon-file-alt:before { + content: "\f0f6"; } -.ckan-icon-photo { - width: 20px; - height: 20px; - background-position: -20px -33px; +.icon-building:before { + content: "\f0f7"; } -.ckan-icon-add { - width: 20px; - height: 20px; - background-position: -40px -33px; +.icon-hospital:before { + content: "\f0f8"; } -.ckan-icon-home { - width: 20px; - height: 20px; - background-position: -60px -33px; +.icon-ambulance:before { + content: "\f0f9"; } -.ckan-icon-rewind { - width: 20px; - height: 20px; - background-position: -80px -33px; +.icon-medkit:before { + content: "\f0fa"; +} +.icon-fighter-jet:before { + content: "\f0fb"; +} +.icon-beer:before { + content: "\f0fc"; +} +.icon-h-sign:before { + content: "\f0fd"; +} +.icon-plus-sign-alt:before { + content: "\f0fe"; } -.ckan-icon-tools { - width: 20px; - height: 20px; - background-position: -100px -33px; +.icon-double-angle-left:before { + content: "\f100"; } -.ckan-icon-flag { - width: 20px; - height: 20px; - background-position: -120px -33px; +.icon-double-angle-right:before { + content: "\f101"; } -.ckan-icon-clipboard { - width: 20px; - height: 20px; - background-position: -140px -33px; +.icon-double-angle-up:before { + content: "\f102"; } -.ckan-icon-share { - width: 20px; - height: 20px; - background-position: -160px -33px; +.icon-double-angle-down:before { + content: "\f103"; } -.ckan-icon-info { - width: 20px; - height: 20px; - background-position: -180px -33px; +.icon-angle-left:before { + content: "\f104"; } -.ckan-icon-download { - width: 20px; - height: 20px; - background-position: -200px -33px; +.icon-angle-right:before { + content: "\f105"; } -.ckan-icon-star { - width: 20px; - height: 20px; - background-position: -220px -33px; +.icon-angle-up:before { + content: "\f106"; } -.ckan-icon-info-flat { - width: 20px; - height: 20px; - background-position: -240px -33px; +.icon-angle-down:before { + content: "\f107"; } -.ckan-icon-tag { - width: 20px; - height: 20px; - background-position: -260px -33px; +.icon-desktop:before { + content: "\f108"; } -.ckan-icon-plus { - width: 20px; - height: 20px; - background-position: -280px -33px; - width: 16px; +.icon-laptop:before { + content: "\f109"; } -.ckan-icon-head { - width: 20px; - height: 20px; - background-position: -300px -33px; +.icon-tablet:before { + content: "\f10a"; } -.ckan-icon-arrow-e { - width: 20px; - height: 20px; - background-position: -320px -33px; - width: 16px; +.icon-mobile-phone:before { + content: "\f10b"; } -.ckan-icon-bookmark { - width: 25px; - height: 25px; - background-position: 0px -53px; +.icon-circle-blank:before { + content: "\f10c"; } -.format-label { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - text-indent: -900em; - background: url("../../../base/images/sprite-resource-icons.png") no-repeat 0 0; +.icon-quote-left:before { + content: "\f10d"; } -.format-label:last-child { - *margin-left: 0; +.icon-quote-right:before { + content: "\f10e"; } -.format-label { - width: 32px; - height: 35px; - background-position: 0px -62px; +.icon-spinner:before { + content: "\f110"; } -.format-label[data-format=rdf], -.format-label[data-format*=rdf] { - width: 32px; - height: 35px; - background-position: -32px -62px; +.icon-circle:before { + content: "\f111"; } -.format-label[data-format=pdf], -.format-label[data-format*=pdf] { - width: 32px; - height: 35px; - background-position: -64px -62px; +.icon-reply:before { + content: "\f112"; } -.format-label[data-format=api], -.format-label[data-format*=api] { - width: 32px; - height: 35px; - background-position: -96px -62px; +.icon-github-alt:before { + content: "\f113"; } -.format-label[data-format=zip], -.format-label[data-format*=zip] { - width: 32px; - height: 35px; - background-position: -128px -62px; +.icon-folder-close-alt:before { + content: "\f114"; } -.format-label[data-format=xls], -.format-label[data-format*=xls] { - width: 32px; - height: 35px; - background-position: -160px -62px; +.icon-folder-open-alt:before { + content: "\f115"; } -.format-label[data-format=csv], -.format-label[data-format*=csv] { - width: 32px; - height: 35px; - background-position: -192px -62px; +[class^="icon-"], +[class*=" icon-"] { + display: inline-block; + text-align: right; + font-size: 14px; + line-height: 1; + width: 14px; } -.format-label[data-format=txt], -.format-label[data-format*=txt] { - width: 32px; - height: 35px; - background-position: -224px -62px; +.btn [class^="icon-"], +.nav [class^="icon-"], +.module-heading [class^="icon-"], +.dropdown [class^="icon-"], +.btn [class*=" icon-"], +.nav [class*=" icon-"], +.module-heading [class*=" icon-"], +.dropdown [class*=" icon-"] { + margin-right: 4px; } -.format-label[data-format=xml], -.format-label[data-format*=xml] { - width: 32px; - height: 35px; - background-position: -256px -62px; +.info-block [class^="icon-"], +.info-block [class*=" icon-"] { + float: left; + font-size: 28px; + width: 28px; + margin-right: 5px; + margin-top: 2px; } -.format-label[data-format=json], -.format-label[data-format*=json] { - width: 32px; - height: 35px; - background-position: -288px -62px; +.breadcrumb .home .icon-home { + font-size: 24px; + width: 24px; + vertical-align: -1px; } -.format-label[data-format=html], -.format-label[data-format*=html] { - width: 32px; - height: 35px; - background-position: -320px -62px; +.info-block-small [class^="icon-"], +.info-block-small [class*=" icon-"] { + font-size: 14px; + width: 14px; + margin-top: 1px; } -li [class^="icon-"], -li [class*=" icon-"] { - width: auto; +.wrapper { + *zoom: 1; + background-color: #FFF; + border: 1px solid #cccccc; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + position: relative; + background: #ffffff url("../../../base/images/nav.png") 0 0 repeat-y; + margin-bottom: 20px; } -li .icon-large:before, -li .icon-large:before { - width: auto; +.wrapper:before, +.wrapper:after { + display: table; + content: ""; + line-height: 0; +} +.wrapper:after { + clear: both; +} +.wrapper.no-nav { + background-image: none; } [role=main], .main { position: relative; - padding-top: 27px; - padding-bottom: 27px; - background-color: #efefef; + padding-top: 10px; + padding-bottom: 20px; + background: #eeeeee url("../../../base/images/bg.png"); } [role=main] { min-height: 350px; } .main:after, -.main:before, -[role=main]:after, -[role=main]:before { - content: ""; - position: absolute; - left: 0; - right: 0; - height: 7px; - background: #ffffff; - border-color: #c9c9c9; - border-style: solid; - border-width: 0; -} -.main:before, -[role=main]:before { - top: 0; - border-bottom-width: 1px; -} -.main:after, [role=main]:after { bottom: 0; border-top-width: 1px; } [role=main] .primary { - float: left; - margin-left: 20px; - width: 700px; + width: 717px; float: right; } [role=main] .secondary { - float: left; margin-left: 20px; width: 220px; margin-left: 0; float: left; } -.primary > :last-child, -.secondary > :last-child { - margin-bottom: 0; +.primary > :last-child, +.secondary > :last-child { + margin-bottom: 0; +} +.primary .primary { + float: left; + width: 467px; + margin-left: 0; + margin-bottom: 20px; +} +.primary .primary h1:first-child, +.primary .primary h2:first-child, +.primary .primary h3:first-child, +.primary .primary h4:first-child { + margin-top: 0; +} +.primary .tertiary { + float: left; + width: 180px; + margin-left: 20px; + margin-bottom: 20px; +} +.hero { + background: url("../../../base/images/background-tile.png"); +} +.hero:after { + background-color: rgba(0, 0, 0, 0.09); + background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: -ms-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0.15)), to(rgba(0, 0, 0, 0))); + background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-repeat: repeat-x; + background-color: #f6f6f6; + border-bottom: 1px solid #d0d0d0; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; + -webkit-box-shadow: inset 0 -4px 0 rgba(0, 0, 0, 0.03); + -moz-box-shadow: inset 0 -4px 0 rgba(0, 0, 0, 0.03); + box-shadow: inset 0 -4px 0 rgba(0, 0, 0, 0.03); +} +.hero:after .back:hover { + text-decoration: none; +} +.hero:after .back:hover span { + text-decoration: underline; +} +.context-info .module-content { + padding: 15px; +} +.context-info .image { + margin-bottom: 10px; +} +.context-info .image img, +.context-info .image a { + display: block; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.context-info p { + overflow: auto; +} +.context-info code { + display: block; + font-weight: normal; + padding: 0; + margin: 0; + overflow: auto; +} +.context-info h1.heading { + margin: 0 0 5px 0; + font-size: 18px; + line-height: 1.3; +} +.context-info .info { + margin-top: 15px; + padding-top: 10px; + border-top: 1px dotted #DDD; +} +.context-info .info dl dd { + margin-top: 3px; + margin-left: 0; +} +.context-info .nums { + *zoom: 1; + margin-top: 15px; + padding-top: 10px; + padding-bottom: 0; + border-top: 1px dotted #DDD; +} +.context-info .nums:before, +.context-info .nums:after { + display: table; + content: ""; + line-height: 0; +} +.context-info .nums:after { + clear: both; +} +.context-info .nums dl { + float: left; + width: 50%; + margin: 5px 0 0 0; + color: #444444; +} +.context-info .nums dl dt { + display: block; + font-size: 13px; + font-weight: 300; +} +.context-info .nums dl dd { + display: block; + font-size: 30px; + font-weight: 700; + line-height: 36px; + margin-left: 0; +} +.context-info .nums dl dd .smallest { + font-size: 13px; +} +.context-info .nums dl dd .smaller { + font-size: 16px; } -.hero { - background: url("../../../base/images/background-tile.png"); +.context-info .nums dl dd .small { + font-size: 21px; } -.hero:after { - background-color: rgba(0, 0, 0, 0.09); - background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: -ms-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0.15)), to(rgba(0, 0, 0, 0))); - background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-repeat: repeat-x; - background-color: transparent; - top: 7px; - bottom: auto; - height: 5px; +.context-info .follow_button { + margin-top: 15px; +} +.context-info.editing .module-content { + margin-top: 0; } .hero { - padding-bottom: 0; + background: url("../../../base/images/background-tile.png"); + padding: 20px 0; min-height: 0; } .hero > .container { position: relative; padding-bottom: 0; } -.hero-primary, -.hero-secondary { - float: left; - margin-left: 20px; - width: 460px; -} -.hero-primary { - margin-left: 0; -} -.hero-primary { - margin-left: 0; - margin-bottom: 0; -} -.hero-secondary { - position: absolute; - bottom: 0; - right: 0; -} -.hero-secondary-inner { - bottom: 0; - left: 0; - right: 0; -} -.hero .module-popup { - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - margin-top: 50px; +.hero .search-giant { + margin-bottom: 10px; } -.hero .module-popup .module-content { - padding-bottom: 2px; +.hero .search-giant input { + border-color: #003f52; } .hero .page-heading { font-size: 18px; @@ -6734,290 +7984,339 @@ li .icon-large:before { } .hero .module-dark { padding: 5px; - margin-bottom: 10px; + margin-bottom: 0; color: #ffffff; background: #ffffff; } .hero .module-dark .module-content { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - background-color: #068106; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; + background-color: #2f9b45; + border-bottom: none; } .hero .module-dark .module-content .heading { + margin-top: 0; margin-bottom: 7px; + font-size: 24px; + line-height: 40px; } .hero .tags { - margin-bottom: 9px; -} -.hero .tags .tag, -.hero .tags .tag-list { - display: inline-block; -} -.hero .tags .tag-list { - padding: 0; -} -.hero .tags .tag { - margin-right: 15px; -} -header.masthead { *zoom: 1; - color: #ffffff; - padding: 5px 10px 3px; - height: 55px; - background-color: #079107; - background-image: -moz-linear-gradient(top, #068106, #08a808); - background-image: -ms-linear-gradient(top, #068106, #08a808); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#068106), to(#08a808)); - background-image: -webkit-linear-gradient(top, #068106, #08a808); - background-image: -o-linear-gradient(top, #068106, #08a808); - background-image: linear-gradient(top, #068106, #08a808); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#068106', endColorstr='#08a808', GradientType=0); + padding: 5px 10px 10px 10px; + background-color: #237434; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; } -header.masthead:before, -header.masthead:after { +.hero .tags:before, +.hero .tags:after { display: table; content: ""; + line-height: 0; } -header.masthead:after { +.hero .tags:after { clear: both; } -header.masthead .container { - position: relative; +.hero .tags h3, +.hero .tags .tag { + display: block; + float: left; + margin: 5px 10px 0 0; } -header.masthead a { - color: #ffffff; +.hero .tags h3 { + font-size: 14px; + line-height: 20px; + padding: 2px 8px; } -header.masthead hgroup h1, -header.masthead hgroup h2 { +.hero-primary, +.hero-secondary { float: left; - font-size: 34px; - line-height: 1.5; -} -header.masthead hgroup h1 { - font-weight: 900; - letter-spacing: -1px; + margin-left: 20px; + width: 460px; } -header.masthead hgroup h2 { - position: absolute; - bottom: -3px; - left: 0; - margin: 0; - font-size: 15px; - font-weight: normal; - line-height: 1.2; - white-space: nowrap; +.hero-primary { + margin-left: 0; + margin-bottom: 0; } -header.masthead .content { +.hero-secondary { position: absolute; - top: 10px; + bottom: 0; right: 0; } -header.masthead .section { - float: left; +.hero-secondary .hero-secondary-inner { + bottom: 0; + left: 0; + right: 0; } -header.masthead .navigation { - margin-right: 20px; +.main.homepage { + padding-top: 20px; + padding-bottom: 20px; + border-top: 1px solid #cccccc; } -header.masthead .navigation ul.unstyled { - *zoom: 1; - margin: 5px 0; +.main.homepage .module-heading .media-image { + margin-right: 15px; + max-height: 53px; + -webkit-box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.5); + -moz-box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.5); + box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.5); } -header.masthead .navigation ul.unstyled:before, -header.masthead .navigation ul.unstyled:after { - display: table; - content: ""; +.main.homepage .group-listing .box { + min-height: 275px; } -header.masthead .navigation ul.unstyled:after { - clear: both; +.main.homepage .group-list { + margin-bottom: 0; } -header.masthead .navigation ul.unstyled li { - display: block; - float: left; +.main.homepage .group-list .dataset-content { + min-height: 70px; } -header.masthead .navigation ul.unstyled li a { - display: block; - font-size: 12px; - font-weight: bold; - padding: 4px 10px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; +.main.homepage .box .module { + margin-top: 0; } -header.masthead .navigation ul.unstyled li a.active { - background-color: #128712; - box-shadow: 0 -1px 0 #0c5a0c, 0 1px 0 #2b942b; +.account-masthead { + *zoom: 1; + min-height: 30px; + color: #ffffff; + background: #237434 url("../../../base/images/bg.png"); } -header.masthead .site-search { - margin: 3px 0; +.account-masthead:before, +.account-masthead:after { + display: table; + content: ""; + line-height: 0; } -header.masthead .site-search input { - width: 190px; - font-size: 11px; - padding: 4px; +.account-masthead:after { + clear: both; } -header.masthead .account { - background: #079007; - padding: 3px 5px; - margin: 2px 0 2px 30px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 2px 4px #067706; - -moz-box-shadow: inset 0 2px 4px #067706; - box-shadow: inset 0 2px 4px #067706; +.account-masthead .account { + float: right; } -header.masthead .account ul.unstyled { +.account-masthead .account ul { *zoom: 1; } -header.masthead .account ul.unstyled:before, -header.masthead .account ul.unstyled:after { +.account-masthead .account ul:before, +.account-masthead .account ul:after { display: table; content: ""; + line-height: 0; } -header.masthead .account ul.unstyled:after { +.account-masthead .account ul:after { clear: both; } -header.masthead .account ul.unstyled li { +.account-masthead .account ul li { display: block; float: left; + border-left: 1px solid #1d602b; } -header.masthead .account ul.unstyled li a { +.account-masthead .account ul li a { display: block; - font-size: 12px; + color: #cbe6d1; + font-size: 13px; font-weight: bold; - padding: 4px 10px; + padding: 0 10px; + line-height: 31px; +} +.account-masthead .account ul li a span.username { + margin: 0 2px 0 4px; } -header.masthead .account ul.unstyled li a.sub { +.account-masthead .account ul li a:hover { + color: #e0f0e3; + background-color: #1d602b; + text-decoration: none; +} +.account-masthead .account ul li a.sub { font-weight: 300; - border-left: 1px solid #067706; } -header.masthead .account .dropdown { - float: left; +.account-masthead .account ul li a .btn { + vertical-align: 1px; + margin-left: 3px; } -header.masthead .account .button { - display: block; - text-decoration: none; - background-color: #068106; - color: #83c083; - text-shadow: 0 1px 1px #045004; +.account-masthead .account .notifications a span { + font-size: 12px; + margin-left: 3px; + padding: 1px 6px; + background-color: #1d602b; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 #079907; - -moz-box-shadow: inset 0 1px 0 #079907; - box-shadow: inset 0 1px 0 #079907; } -header.masthead .account .image { - margin: 2px 0; - padding: 0 4px 0 0; - overflow: hidden; - font-size: 10px; +.account-masthead .account .notifications a:hover span { + color: #ffffff; + background-color: #174d22; +} +.account-masthead .account .notifications.notifications-important a span { + color: #ffffff; + background-color: #c9403a; +} +.account-masthead .account.authed .image { + padding: 0 6px; +} +.account-masthead .account.authed .image img { + vertical-align: -6px; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; } -header.masthead .account .image i { - vertical-align: -1px; +.masthead { + *zoom: 1; + min-height: 55px; + color: #ffffff; + background: #2f9b45 url("../../../base/images/bg.png"); } -header.masthead .account .image img { - opacity: 0.7; - border-right: 1px solid #08a808; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; +.masthead:before, +.masthead:after { + display: table; + content: ""; + line-height: 0; +} +.masthead:after { + clear: both; } -header.masthead .account .notifications { - padding: 4px 8px 3px 8px; - margin: 2px 5px 2px 0; +.masthead .container { + position: relative; } -header.masthead .account .notifications.notifications-important { +.masthead a { color: #ffffff; - background-color: #c9403a; - text-shadow: 0 1px 1px #a3322d; - -webkit-box-shadow: inset 0 1px 0 #ce534e; - -moz-box-shadow: inset 0 1px 0 #ce534e; - box-shadow: inset 0 1px 0 #ce534e; } -header.masthead .account .dropdown.open .image img, -header.masthead .account .dropdown .image:hover img { - opacity: 1; - border-right-color: #0ad90a; +.masthead hgroup h1, +.masthead hgroup h2 { + float: left; + font-size: 30px; + line-height: 1.5; } -header.masthead .account .dropdown.open .button, -header.masthead .account .dropdown .button:hover { - color: #ffffff; - background-color: #6ab36a; - -webkit-box-shadow: inset 0 1px 0 #83c083; - -moz-box-shadow: inset 0 1px 0 #83c083; - box-shadow: inset 0 1px 0 #83c083; - text-decoration: none; +.masthead hgroup h1 { + font-weight: 900; + letter-spacing: -1px; + margin: 3px 0; +} +.masthead hgroup h2 { + position: absolute; + bottom: -3px; + left: 0; + margin: 0; + font-size: 15px; + font-weight: normal; + line-height: 1.2; + white-space: nowrap; } -header.masthead .account .dropdown.open .notifications-important, -header.masthead .account .dropdown .notifications-important:hover { - background-color: #d46762; - text-shadow: 0 1px 1px #c9403a; - -webkit-box-shadow: inset 0 1px 0 #d97a76; - -moz-box-shadow: inset 0 1px 0 #d97a76; - box-shadow: inset 0 1px 0 #d97a76; +.masthead .content { + position: absolute; + top: 10px; + right: 0; } -header.masthead .account.authed { - margin: 0 0 0 30px; +.masthead .section { + float: left; } -header.masthead .account.not-authed { - padding-top: 2px; - padding-bottom: 2px; +.masthead input[type="text"] { + border-color: #29873c; } -header.masthead .dropdown-menu { - margin-top: -1px; +.masthead .navigation { + margin-right: 20px; } -header.masthead .user-dropdown-menu a { - color: #068106; +.masthead .navigation .nav-pills { + margin-bottom: 0; } -header.masthead .user-dropdown-menu a:hover { - color: #ffffff; +.masthead .navigation .nav-pills li a:hover, +.masthead .navigation .nav-pills li.active a { + background-color: #237434; } -header.masthead .debug { +.masthead .site-search { + margin: 2px 8px 2px 0; +} +.masthead .site-search input { + width: 200px; + padding: 4px 10px; +} +.masthead .debug { position: absolute; - bottom: 10px; + top: 37px; left: 10px; - font-size: 11px; color: rgba(255, 255, 255, 0.5); - line-height: 1.2; } .site-footer { *zoom: 1; + min-height: 55px; color: #ffffff; - padding: 5px 10px 3px; - height: 55px; - background-color: #079107; - background-image: -moz-linear-gradient(top, #068106, #08a808); - background-image: -ms-linear-gradient(top, #068106, #08a808); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#068106), to(#08a808)); - background-image: -webkit-linear-gradient(top, #068106, #08a808); - background-image: -o-linear-gradient(top, #068106, #08a808); - background-image: linear-gradient(top, #068106, #08a808); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#068106', endColorstr='#08a808', GradientType=0); - font-size: 12px; + background: #2f9b45 url("../../../base/images/bg.png"); padding: 20px 0; } .site-footer:before, .site-footer:after { display: table; content: ""; + line-height: 0; } .site-footer:after { clear: both; } +.site-footer .container { + position: relative; +} +.site-footer a { + color: #ffffff; +} +.site-footer hgroup h1, +.site-footer hgroup h2 { + float: left; + font-size: 30px; + line-height: 1.5; +} +.site-footer hgroup h1 { + font-weight: 900; + letter-spacing: -1px; + margin: 3px 0; +} +.site-footer hgroup h2 { + position: absolute; + bottom: -3px; + left: 0; + margin: 0; + font-size: 15px; + font-weight: normal; + line-height: 1.2; + white-space: nowrap; +} +.site-footer .content { + position: absolute; + top: 10px; + right: 0; +} +.site-footer .section { + float: left; +} +.site-footer input[type="text"] { + border-color: #29873c; +} +.site-footer .navigation { + margin-right: 20px; +} +.site-footer .navigation .nav-pills { + margin-bottom: 0; +} +.site-footer .navigation .nav-pills li a:hover, +.site-footer .navigation .nav-pills li.active a { + background-color: #237434; +} +.site-footer .site-search { + margin: 2px 8px 2px 0; +} +.site-footer .site-search input { + width: 200px; + padding: 4px 10px; +} +.site-footer .debug { + position: absolute; + top: 37px; + left: 10px; + color: rgba(255, 255, 255, 0.5); +} .site-footer, .site-footer label, .site-footer small { - color: #ccdee3; + color: #acd7b5; } .site-footer a { - color: #ccdee3; + color: #acd7b5; } .footer-links, .attribution { @@ -7025,22 +8324,27 @@ header.masthead .debug { margin-left: 20px; width: 460px; } -.footer-links { +.footer-links { + margin-left: 0; +} +.footer-links ul { + float: left; + margin-left: 20px; + width: 220px; +} +.footer-links ul:first-child { margin-left: 0; } -.footer-links li { - display: inline-block; - width: 40%; - margin-right: 5%; +.footer-links ul li { margin-bottom: 5px; } .attribution small { - color: #ccdee3; + color: #acd7b5; font-size: 12px; } .attribution .ckan-footer-logo { display: block; - width: 65px; + width: 68px; height: 21px; margin-top: 2px; background: url("../../../base/images/ckan-logo-footer.png") no-repeat top left; @@ -7053,6 +8357,7 @@ header.masthead .debug { .lang-select:after { display: table; content: ""; + line-height: 0; } .lang-select:after { clear: both; @@ -7069,153 +8374,66 @@ header.masthead .debug { .lang-dropdown li { width: auto; } -.lang-dropdown .select2-result-label[data-value]:before { - content: ""; - display: inline-block; - background-image: url("../../../base/images/flags.png"); - background-repeat: no-repeat; - background-position: 0 11px; - width: 17px; - height: 11px; - position: relative; - top: 1px; -} -.lang-dropdown .select2-result-label[data-value*="/en/"]:before { - background-position: 0 0; -} -.lang-dropdown .select2-result-label[data-value*="/de/"]:before { - background-position: 0 -11px; -} -.lang-dropdown .select2-result-label[data-value*="/fr/"]:before { - background-position: 0 -22px; -} -.lang-dropdown .select2-result-label[data-value*="/it/"]:before { - background-position: 0 -33px; -} -.lang-dropdown .select2-result-label[data-value*="/es/"]:before { - background-position: 0 -44px; -} -.lang-dropdown .select2-result-label[data-value*="/pl/"]:before { - background-position: 0 -55px; +.table-selected td { + background-color: #f5f5f5; } -.lang-dropdown .select2-result-label[data-value*="/ru/"]:before { - background-position: 0 -66px; +.table-selected td .edit { + display: block; } -.lang-dropdown .select2-result-label[data-value*="/nl/"]:before { - background-position: 0 -77px; +.table-bulk-edit th input { + top: -5px; } -.lang-dropdown .select2-result-label[data-value*="/sv/"]:before { - background-position: 0 -88px; +.table-bulk-edit .table-actions .btn-group { + float: left; + margin: 0 10px 0 0; } -.lang-dropdown .select2-result-label[data-value*="/no/"]:before { - background-position: 0 -99px; +.table-bulk-edit .context p { + margin-bottom: 0; } -.lang-dropdown .select2-result-label[data-value*="/cs/"]:before, -.lang-dropdown .select2-result-label[data-value*="/cs_CZ/"]:before { - background-position: 0 -110px; +.table-header thead th { + background-color: #f6f6f6; } -.lang-dropdown .select2-result-label[data-value*="/hu/"]:before { - background-position: 0 -121px; +.table-edit-hover .edit { + display: none; + float: right; } -.lang-dropdown .select2-result-label[data-value*="/pt_BR/"]:before { - background-position: 0 -132px; +.table-edit-hover tr:hover .edit { + display: block; } -.lang-dropdown .select2-result-label[data-value*="/fi/"]:before { - background-position: 0 -143px; +.js .table-toggle-more .toggle-more { + display: none; } -.lang-dropdown .select2-result-label[data-value*="/bg/"]:before { - background-position: 0 -154px; +.js .table-toggle-more .show-more { + display: inline; } -.lang-dropdown .select2-result-label[data-value*="/ca/"]:before { - background-position: 0 -165px; +.js .table-toggle-more .show-less { + display: none; } -.lang-dropdown .select2-result-label[data-value*="/sq/"]:before { - background-position: 0 -176px; +.js .table-toggle-more .toggle-seperator { + display: table-row; } -.lang-dropdown .select2-result-label[data-value*="/sr/"]:before, -.lang-dropdown .select2-result-label[data-value*="/sr_Latn/"]:before { - background-position: 0 -187px; +.js .table-toggle-more .toggle-seperator td { + height: 11px; + padding: 0; + background-image: url("../../../base/images/table-seperator.png"); } -.lang-dropdown .select2-result-label[data-value*="/zh_TW/"]:before { - background-position: 0 -198px; +.js .table .toggle-show td { + background: none; + text-align: center; } -.lang-dropdown .select2-result-label[data-value*="/lv/"]:before { - background-position: 0 -209px; +.js .table-toggle-less .show-less { + display: inline; } -.lang-dropdown .select2-result-label[data-value*="/sk/"]:before { - background-position: 0 -220px; +.js .table-toggle-less .show-more { + display: none; } -.lang-dropdown .select2-result-label[data-value*="/pt_BR/"]:before { - background-position: 0 -132px; +.js .table-toggle-less .toggle-seperator { + display: none; } .profile .empty, .profile .dataset-list { margin-bottom: 20px; } -.profile-info .module-content { - padding: 15px; -} -.profile-info .avatar { - border: 1px solid #DDD; - padding: 5px; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; -} -.profile-info .avatar img, -.profile-info .avatar a { - display: block; -} -.profile-info code { - font-weight: normal; - padding: 0; - margin: 0; -} -.profile-info h1.heading { - margin: 10px 0 5px 0; - font-size: 21px; -} -.profile-info .info { - margin-top: 15px; - padding-top: 10px; - border-top: 1px dotted #DDD; -} -.profile-info .info dl dd { - margin-top: 3px; - margin-left: 0; -} -.profile-info .nums { - *zoom: 1; - margin-top: 15px; - padding-top: 10px; - padding-bottom: 0; - border-top: 1px dotted #DDD; -} -.profile-info .nums:before, -.profile-info .nums:after { - display: table; - content: ""; -} -.profile-info .nums:after { - clear: both; -} -.profile-info .nums dl { - float: left; - width: 33%; - margin: 5px 0 0 0; - color: #4d4d4d; -} -.profile-info .nums dl dt { - display: block; - font-weight: 300; -} -.profile-info .nums dl dd { - display: block; - font-size: 30px; - font-weight: 700; - line-height: 1.2; - margin-left: 0; -} .activity { margin: 10px 0; padding: 0; @@ -7232,13 +8450,16 @@ header.masthead .debug { .activity .item:after { display: table; content: ""; + line-height: 0; } .activity .item:after { clear: both; } -.activity .item i { +.activity .item .icon { display: block; - float: left; + position: absolute; + top: 0; + left: 0; width: 30px; height: 30px; line-height: 30px; @@ -7246,7 +8467,6 @@ header.masthead .debug { color: #ffffff; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); font-weight: normal; - font-size: 16px; margin-right: 10px; -webkit-border-radius: 100px; -moz-border-radius: 100px; @@ -7261,20 +8481,19 @@ header.masthead .debug { border-radius: 100px; } .activity .item .actor .gravatar { - float: left; - margin-top: -5px; - margin-right: 10px; + position: absolute; + top: 0; + left: 40px; } .activity .item p { font-size: 14px; line-height: 1.5; - margin: 5px 0 0 0; + margin: 5px 0 0 80px; } .activity .item .date { color: #999; font-size: 12px; white-space: nowrap; - margin-left: 5px; } .activity .item .new { display: block; @@ -7294,106 +8513,278 @@ header.masthead .debug { -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } -.popover .about { - margin-bottom: 10px; +.activity .load-less { + margin-bottom: 15px; +} +.popover { + width: 300px; +} +.popover .popover-title { + font-weight: bold; + margin-bottom: 0; +} +.popover p.about { + margin: 0 0 10px 0; } .popover .popover-close { float: right; text-decoration: none; } -.activity .item i { - background-color: #767dce; +.activity .item .icon { + background-color: #999999; } -.activity .item.added-tag i { +.activity .item.added-tag .icon { background-color: #6995a6; } -.activity .item.changed-group i { +.activity .item.changed-group .icon { background-color: #767dce; } -.activity .item.changed-package i { +.activity .item.changed-package .icon { background-color: #8c76ce; } -.activity .item.changed-package_extra i { +.activity .item.changed-package_extra .icon { background-color: #769ace; } -.activity .item.changed-resource i { +.activity .item.changed-resource .icon { background-color: #aa76ce; } -.activity .item.changed-user i { +.activity .item.changed-user .icon { background-color: #76b8ce; } -.activity .item.deleted-group i { +.activity .item.changed-organization .icon { + background-color: #699fa6; +} +.activity .item.deleted-group .icon { background-color: #b95252; } -.activity .item.deleted-package i { +.activity .item.deleted-package .icon { background-color: #b97452; } -.activity .item.deleted-package_extra i { +.activity .item.deleted-package_extra .icon { background-color: #b95274; } -.activity .item.deleted-resource i { +.activity .item.deleted-resource .icon { background-color: #b99752; } -.activity .item.new-group i { +.activity .item.deleted-organization .icon { + background-color: #b95297; +} +.activity .item.new-group .icon { background-color: #69a67a; } -.activity .item.new-package i { +.activity .item.new-package .icon { background-color: #69a68e; } -.activity .item.new-package_extra i { +.activity .item.new-package_extra .icon { background-color: #6ca669; } -.activity .item.new-resource i { +.activity .item.new-resource .icon { background-color: #81a669; } -.activity .item.new-user i { +.activity .item.new-user .icon { background-color: #69a6a3; } -.activity .item.removed-tag i { +.activity .item.new-organization .icon { + background-color: #81a669; +} +.activity .item.removed-tag .icon { background-color: #b95297; } -.activity .item.deleted-related-item i { +.activity .item.deleted-related-item .icon { background-color: #b9b952; } -.activity .item.follow-dataset i { +.activity .item.follow-dataset .icon { background-color: #767dce; } -.activity .item.follow-user i { +.activity .item.follow-user .icon { background-color: #8c76ce; } -.activity .item.new-related-item i { +.activity .item.new-related-item .icon { background-color: #95a669; } -.activity .item.follow-group i { +.activity .item.follow-group .icon { background-color: #8ba669; } -.popover-context-loading .popover-title { +.dropdown:hover .dropdown-menu { + display: block; +} +.js .dropdown .dropdown-menu, +.js .dropdown:hover .dropdown-menu { + display: none; +} +.js .dropdown.open .dropdown-menu { + display: block; +} +#followee-filter .btn { + *zoom: 1; +} +#followee-filter .btn:before, +#followee-filter .btn:after { + display: table; + content: ""; + line-height: 0; +} +#followee-filter .btn:after { + clear: both; +} +#followee-filter .btn span, +#followee-filter .btn strong { + display: block; + float: left; + line-height: 1.5; +} +#followee-filter .btn span { + font-weight: normal; +} +#followee-filter .btn strong { + margin: 0 5px; + white-space: nowrap; + max-width: 90px; + overflow: hidden; + text-overflow: ellipsis; +} +.dashboard-context { + position: relative; + margin-bottom: 20px; + padding: 20px; + border-bottom: 1px solid #DCDCDC; + background-color: #f6f6f6; + -webkit-border-radius: 3px 0 0 0; + -moz-border-radius: 3px 0 0 0; + border-radius: 3px 0 0 0; +} +.dashboard-context h2 { + margin-bottom: 10px; +} +.dashboard-context .arrow { + position: absolute; + content: ' '; + top: 30px; + right: -10px; + width: 10px; + height: 21px; + background: transparent url("../../../base/images/dashboard-followee-related.png"); +} +.popover-followee .popover-title { display: none; } -.popover-context-loading .popover-content { +.popover-followee .popover-content { + padding: 0; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } -.popover-context-loading .popover-content img { - vertical-align: -3px; - margin-right: 10px; +.popover-followee .empty { + padding: 10px; } -.follower-list li { - margin: 0 0 15px 0; +.popover-followee .popover-header { + *zoom: 1; + background-color: whiteSmoke; + padding: 5px; + border-bottom: 1px solid #cccccc; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } -.follower-list .gravatar { - vertical-align: -4px; - margin-right: 3px; +.popover-followee .popover-header:before, +.popover-followee .popover-header:after { + display: table; + content: ""; + line-height: 0; +} +.popover-followee .popover-header:after { + clear: both; +} +.popover-followee .popover-header .input-prepend { + margin-bottom: 0; +} +.popover-followee .popover-header .add-on, +.popover-followee .popover-header input { + float: left; + margin: 0; +} +.popover-followee .popover-header .add-on { + padding: 4px 8px 4px 12px; + border-right-width: 0; + -webkit-border-radius: 100px 0 0 100px; + -moz-border-radius: 100px 0 0 100px; + border-radius: 100px 0 0 100px; +} +.popover-followee .popover-header input { + padding: 4px 12px 4px 8px; + font-size: 13px; + width: 207px; + -webkit-border-radius: 0 100px 100px 0; + -moz-border-radius: 0 100px 100px 0; + border-radius: 0 100px 100px 0; +} +.popover-followee .nav { + padding: 0; + margin: 0; + max-height: 205px; + overflow: auto; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; +} +.popover-followee .nav li a { + display: block; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + padding: 7px 10px 7px 15px; + margin: 0; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.popover-followee .nav li a i { + background-color: #2f9b45; + color: #ffffff; + margin-right: 11px; + padding: 3px 5px; + line-height: 1; -webkit-border-radius: 100px; -moz-border-radius: 100px; border-radius: 100px; + -webkit-box-shadow: inset 0 1px 2x rgba(0, 0, 0, 0.2); + -moz-box-shadow: inset 0 1px 2x rgba(0, 0, 0, 0.2); + box-shadow: inset 0 1px 2x rgba(0, 0, 0, 0.2); } -.module-my-datasets .empty { - padding: 10px; +.popover-followee .nav li a:hover i { + background-color: #000; +} +.popover-followee .nav li.active a i { + color: #2f9b45; + background-color: #ffffff; +} +.dashboard-me { + *zoom: 1; + padding: 15px 15px 0 15px; +} +.dashboard-me:before, +.dashboard-me:after { + display: table; + content: ""; + line-height: 0; +} +.dashboard-me:after { + clear: both; +} +.dashboard-me img { + float: left; + margin-right: 10px; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; +} +.dashboard-me strong { + display: block; + font-size: 16px; + margin: 3px 0; } body { - background-color: #08a808; + background: #2f9b45 url("../../../base/images/bg.png"); } [hidden] { display: none; @@ -7412,11 +8803,10 @@ table .metric { width: 140px; } code { - padding: 2px 2px; color: #000000; - font-weight: bold; border: none; background: none; + white-space: normal; } pre { border: none; @@ -7446,10 +8836,11 @@ iframe { text-indent: -999em; } .empty { - color: #aeaeae; + color: #aaaaaa; font-style: italic; } .page-heading { + margin-top: 0; margin-bottom: 16px; } .m-top { @@ -7492,10 +8883,6 @@ iframe { position: relative; top: -20px; } -.ie .module, -.ie .media-image { - border: 1px solid #cccccc; -} .ie .module-popup { border-bottom: none; } @@ -7519,24 +8906,19 @@ iframe { .ie9 .control-large input { height: 56px; } -.ie9 .module { - -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); - box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); +.ie8 .account-masthead a.image, +.ie8 .account-masthead .username { + white-space: nowrap; } -.ie7 .masthead nav ul li a.active, -.ie8 .masthead nav ul li a.active { - position: relative; - top: -1px; - background-color: #068b06; - border-top: 1px solid #057205; - border-bottom: 1px solid #079907; +.ie9 .homepage .media.module-heading .media-image img, +.ie8 .homepage .media.module-heading .media-image img, +.ie7 .homepage .media.module-heading .media-image img { + width: 85px !important; } -.ie8 .masthead .account a.image { - display: block; - width: 25px; - padding-right: 10px; - white-space: nowrap; +.ie8 .hero .hero-primary.module-popup .box, +.ie7 .hero .hero-primary.module-popup .box { + padding-bottom: 20px !important; + margin-bottom: 0 !important; } .ie7 .alert { position: relative; @@ -7556,6 +8938,7 @@ iframe { .ie7 .tags .tag-list:after { display: table; content: ""; + line-height: 0; } .ie7 .tags .tag-list:after { clear: both; @@ -7569,8 +8952,6 @@ iframe { } .ie7 .tags .tag { display: block; - border: 1px solid #d0d0d0; - background: #f5f5f5; } .ie7 .search-giant input { width: 95%; @@ -7621,6 +9002,9 @@ iframe { .ie7 .stages li .highlight { width: auto; } +.ie7 .account-masthead .account a i { + line-height: 31px; +} .ie7 .masthead { position: relative; z-index: 1; @@ -7632,39 +9016,12 @@ iframe { *zoom: 1; } -.ie7 .masthead nav ul { - margin-top: 5px; -} -.ie7 .masthead nav ul li { - float: left; -} -.ie7 .masthead nav ul li a.active { - position: relative; - top: -1px; - background-color: #068b06; - border-top: 1px solid #057205; - border-bottom: 1px solid #079907; -} .ie7 .masthead .header-image { display: block; } .ie7 .masthead .account .dropdown-menu { z-index: 10000; } -.ie7 .footer-links { - *zoom: 1; -} -.ie7 .footer-links:before, -.ie7 .footer-links:after { - display: table; - content: ""; -} -.ie7 .footer-links:after { - clear: both; -} -.ie7 .footer-links li { - float: left; -} .ie7 .module-narrow .nav-item.image { *zoom: 1; } @@ -7672,6 +9029,7 @@ iframe { .ie7 .module-narrow .nav-item.image:after { display: table; content: ""; + line-height: 0; } .ie7 .module-narrow .nav-item.image:after { clear: both; @@ -7689,11 +9047,13 @@ iframe { } .ie7 .module-heading { *zoom: 1; + position: relative; } .ie7 .module-heading:before, .ie7 .module-heading:after { display: table; content: ""; + line-height: 0; } .ie7 .module-heading:after { clear: both; @@ -7713,3 +9073,22 @@ iframe { position: relative; zoom: 1; } +.ie7 .resource-item { + position: static; + padding-bottom: 1px; +} +.ie7 .resource-item .heading { + position: relative; +} +.ie7 .resource-item .format-label { + left: -48px; +} +.ie7 .resource-item .btn-group { + position: relative; + float: right; + top: -35px; + right: 0; +} +.ie7 .media-overlay .media-heading { + background-color: #000; +} diff --git a/ckan/public/base/css/main.css b/ckan/public/base/css/main.css index 074b5a48385..ae2a555db39 100644 --- a/ckan/public/base/css/main.css +++ b/ckan/public/base/css/main.css @@ -4938,6 +4938,11 @@ a.tag:hover { margin-bottom: 0; border-top: 1px solid #dddddd; } +.module-content .pagination { + margin-left: -25px; + margin-right: -25px; + margin-bottom: -20px; +} .module .pagination > ul { -webkit-border-radius: 0; -moz-border-radius: 0; @@ -5105,6 +5110,9 @@ a.tag:hover { .primary .module:first-child { margin-top: 0; } +.no-nav .module:last-child { + margin-top: 0; +} .module-image { float: left; width: 50px; @@ -5282,54 +5290,74 @@ a.tag:hover { .media-item.is-expander:hover .truncator-link { opacity: 1; } -.nav-simple { +.wide .media-item { + width: 186px; +} +.nav-simple, +.nav-aside { *zoom: 1; margin: 0; list-style: none; padding-bottom: 0; } .nav-simple:before, -.nav-simple:after { +.nav-aside:before, +.nav-simple:after, +.nav-aside:after { display: table; content: ""; line-height: 0; } -.nav-simple:after { +.nav-simple:after, +.nav-aside:after { clear: both; } -.nav-simple > li { +.nav-simple > li, +.nav-aside > li { font-size: 12px; line-height: 1.1666666666666667em; padding: 7px 25px; border-bottom: 1px dotted #dddddd; } -.nav-simple > li:last-of-type { +.nav-simple > li:last-of-type, +.nav-aside > li:last-of-type { border-bottom: 0; } -.nav-simple .ckan-icon { +.nav-simple .ckan-icon, +.nav-aside .ckan-icon { position: relative; top: 0px; } -.nav-item > a { +.nav-aside { + border-top: 1px dotted #DDD; + border-bottom: 1px dotted #DDD; + margin-bottom: 15px; +} +.nav-item > a, +.nav-aside li a { color: #333333; font-size: 14px; line-height: 20px; margin: -7px -25px; padding: 7px 25px; } -.nav-item.active { +.nav-item.active, +.nav-aside li.active { background-color: #f6f6f6; } -.nav-item.active > a { +.nav-item.active > a, +.nav-aside li.active a { position: relative; color: #ffffff; background-color: #8ca0a6; } -.nav-item.active > a:hover { +.nav-item.active > a:hover, +.nav-aside li.active a:hover { color: #ffffff; background-color: #8ca0a6; } -.nav-item.active > a:before { +.nav-item.active > a:before, +.nav-aside li.active a:before { content: ' '; position: absolute; top: 0; @@ -5338,24 +5366,29 @@ a.tag:hover { height: 34px; background-image: url("../../../base/images/nav-active.png?1"); } -.nav-item.active > a span { +.nav-item.active > a span, +.nav-aside li.active a span { white-space: nowrap; overflow: hidden; display: block; } -.module-narrow .nav-item > a { +.module-narrow .nav-item > a, +.module-narrow .nav-aside li a { padding-left: 15px; padding-right: 15px; position: relative; } -.module-narrow .nav-item.image { +.module-narrow .nav-item.image, +.module-narrow .nav-aside li.image { position: relative; } -.module-narrow .nav-item.image > a { +.module-narrow .nav-item.image > a, +.module-narrow .nav-aside li.image a { padding-left: 42px; padding-right: 42px; } -.module-narrow .nav-item.image > img { +.module-narrow .nav-item.image > img, +.module-narrow .nav-aside li.image img { position: absolute; top: 50%; left: 15px; @@ -6128,134 +6161,6 @@ textarea { .dataset-heading .popular { top: 0; } -.results { - margin-bottom: 20px; - padding-bottom: 25px; - border-bottom: 1px dotted #dddddd; -} -.results strong, -.is-search-title { - display: block; - font-size: 24px; - line-height: 1.3; - color: #000000; - margin-bottom: 10px; -} -.is-search-title { - margin-bottom: 20px; -} -.results strong:before, -.is-search-title:before { - float: right; - content: " "; - width: 280px; - white-space: pre; -} -.filter-list { - color: #444444; - line-height: 32px; -} -.filter-list .pill { - line-height: 21px; -} -.filter-list .extra { - margin-top: 10px; - font-size: 18px; - font-weight: normal; - color: #000000; -} -.dataset-search { - position: relative; -} -.search-giant, -.search-normal { - position: relative; -} -.search-normal { - display: block; - margin-bottom: 0; -} -.search-giant input { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - font-size: 16px; - padding: 14px 10px; - width: 100%; - height: auto; -} -.search-normal input { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - width: 100%; - height: auto; -} -.search-normal button { - cursor: pointer; - position: absolute; - right: 5px; - top: 50%; - background: transparent; - border: none; - color: #999; - margin-top: -17px; -} -.search-normal button span { - display: none; -} -.search-normal button:hover { - color: #000; -} -.search-giant button { - cursor: pointer; - position: absolute; - right: 15px; - top: 50%; - display: block; - border: none; - padding: 0; - margin-top: -17px; - width: 30px; - height: 30px; - background: transparent url("../../../base/images/icon-search-27x26.png") no-repeat center center; - text-indent: -900em; -} -.control-order-by { - position: absolute; - bottom: -73px; - right: 0; -} -.control-order-by label, -.control-order-by select { - display: inline; -} -.control-order-by select { - width: 160px; -} -.search-aside .control-order-by { - clear: both; - overflow: hidden; - display: block; - position: relative; - bottom: 0; -} -.search-aside .control-order-by label { - float: left; - font-weight: normal; - font-size: 12px; - line-height: 20px; -} -.search-aside .control-order-by select { - float: left; - padding: 2px 4px; - margin: 0; - width: inherit; - font-size: 12px; - height: 20px; - line-height: 20px; - width: 120px; -} .resource-list { margin: 0; list-style: none; @@ -6390,6 +6295,111 @@ textarea { .label[data-format*=turtle] { background-color: #0b4498; } +.search-form { + margin-bottom: 20px; + padding-bottom: 25px; + border-bottom: 1px dotted #dddddd; +} +.search-form .search-input { + position: relative; + margin-bottom: 20px; +} +.search-form .search-input input { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + margin: 0; + width: 100%; + height: auto; +} +.search-form .search-input button { + cursor: pointer; + display: block; + position: absolute; + top: 50%; + margin-top: -10px; + right: 10px; + height: 20px; + padding: 0; + border: none; + background: transparent; +} +.search-form .search-input button span { + display: none; +} +.search-form .search-input button i { + color: #cccccc; + -webkit-transition: color 0.2s ease-in; + -moz-transition: color 0.2s ease-in; + -o-transition: color 0.2s ease-in; + transition: color 0.2s ease-in; +} +.search-form .search-input button:hover i { + color: #000000; +} +.search-form .search-input.search-giant input { + font-size: 16px; + padding: 15px; +} +.search-form .search-input.search-giant button { + margin-top: -15px; + right: 15px; + height: 30px; +} +.search-form .search-input.search-giant button i { + font-size: 28px; + width: 28px; +} +.search-form .control-order-by { + float: right; + margin: 0 0 0 15px; +} +.search-form .control-order-by label, +.search-form .control-order-by select { + display: inline; +} +.search-form .control-order-by select { + width: 160px; + margin: 0; +} +.search-form h2 { + font-size: 24px; + line-height: 1.3; + color: #000000; + margin-bottom: 0; +} +.search-form .filter-list { + color: #444444; + line-height: 32px; + margin: 10px 0 0 0; +} +.search-form .filter-list .pill { + line-height: 21px; +} +.search-form .filter-list .extra { + margin-top: 10px; + font-size: 18px; + font-weight: normal; + color: #000000; +} +.tertiary .control-order-by { + float: none; + margin: 0; +} +.tertiary .control-order-by label { + display: block; + margin-bottom: 5px; + font-weight: normal; + font-size: 12px; +} +.tertiary .control-order-by select { + display: block; + font-size: 12px; + width: 100%; +} +.tertiary .search-input { + margin-bottom: 10px; +} .group .media-vertical .image { margin: 0 -5px 5px; } @@ -6431,12 +6441,8 @@ textarea { .toolbar:after { clear: both; } -.toolbar .add_action { - margin: 0; - list-style: none; - position: absolute; - top: 1px; - right: 0; +.page_primary_action { + margin-bottom: 20px; } .toolbar .breadcrumb { *zoom: 1; @@ -6506,24 +6512,40 @@ textarea { display: none; } .page-header { - position: relative; + *zoom: 1; border-bottom: 1px solid #dddddd; background-color: #f6f6f6; - height: 30px; -webkit-border-radius: 0 3px 0 0; -moz-border-radius: 0 3px 0 0; border-radius: 0 3px 0 0; } +.page-header:before, +.page-header:after { + display: table; + content: ""; + line-height: 0; +} +.page-header:after { + clear: both; +} .page-header .nav-tabs { - position: absolute; - left: 20px; - bottom: -1px; - margin-bottom: 0; + float: left; + margin-bottom: -1px; } .page-header .nav-tabs li.active a, .page-header .nav-tabs a:hover { background-color: #ffffff; } +.page-header .content_action { + float: right; + margin-top: -5px; + margin-right: -7px; +} +.no-nav .page-header { + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; +} h1 { font-size: 28px; } @@ -7812,8 +7834,8 @@ h4 small { } .primary .primary { float: left; - width: 479px; - margin-left: 20px; + width: 467px; + margin-left: 0; margin-bottom: 20px; } .primary .primary h1:first-child, @@ -7935,6 +7957,9 @@ h4 small { .context-info .nums dl dd .small { font-size: 21px; } +.context-info .follow_button { + margin-top: 15px; +} .context-info.editing .module-content { margin-top: 0; } @@ -7947,6 +7972,9 @@ h4 small { position: relative; padding-bottom: 0; } +.hero .search-giant { + margin-bottom: 10px; +} .hero .search-giant input { border-color: #003f52; } @@ -7965,10 +7993,13 @@ h4 small { -moz-border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0; background-color: #005d7a; + border-bottom: none; } .hero .module-dark .module-content .heading { margin-top: 0; margin-bottom: 7px; + font-size: 24px; + line-height: 40px; } .hero .tags { *zoom: 1; @@ -8628,7 +8659,7 @@ h4 small { .dashboard-context .arrow { position: absolute; content: ' '; - top: 70px; + top: 30px; right: -10px; width: 10px; height: 21px; @@ -8727,6 +8758,31 @@ h4 small { color: #187794; background-color: #ffffff; } +.dashboard-me { + *zoom: 1; + padding: 15px 15px 0 15px; +} +.dashboard-me:before, +.dashboard-me:after { + display: table; + content: ""; + line-height: 0; +} +.dashboard-me:after { + clear: both; +} +.dashboard-me img { + float: left; + margin-right: 10px; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; +} +.dashboard-me strong { + display: block; + font-size: 16px; + margin: 3px 0; +} body { background: #005d7a url("../../../base/images/bg.png"); } diff --git a/ckan/public/base/css/maroon.css b/ckan/public/base/css/maroon.css index 3ecb2ff2fce..c052d27ea74 100644 --- a/ckan/public/base/css/maroon.css +++ b/ckan/public/base/css/maroon.css @@ -48,11 +48,25 @@ sub { bottom: -0.25em; } img { + /* Responsive images (ensure images don't scale beyond their parents) */ + max-width: 100%; + /* Part 1: Set a maxium relative to the parent */ + + width: auto\9; + /* IE7-8 need help adjusting responsive images */ + + height: auto; + /* Part 2: Scale the height according to the width, otherwise you get stretching */ + vertical-align: middle; border: 0; -ms-interpolation-mode: bicubic; } +#map_canvas img, +.google-maps img { + max-width: none; +} button, input, select, @@ -72,11 +86,21 @@ input::-moz-focus-inner { border: 0; } button, -input[type="button"], +html input[type="button"], input[type="reset"], input[type="submit"] { - cursor: pointer; -webkit-appearance: button; + cursor: pointer; +} +label, +select, +button, +input[type="button"], +input[type="reset"], +input[type="submit"], +input[type="radio"], +input[type="checkbox"] { + cursor: pointer; } input[type="search"] { -webkit-box-sizing: content-box; @@ -92,6 +116,57 @@ textarea { overflow: auto; vertical-align: top; } +@media print { + * { + text-shadow: none !important; + color: #000 !important; + background: transparent !important; + box-shadow: none !important; + } + a, + a:visited { + text-decoration: underline; + } + a[href]:after { + content: " (" attr(href) ")"; + } + abbr[title]:after { + content: " (" attr(title) ")"; + } + .ir a:after, + a[href^="javascript:"]:after, + a[href^="#"]:after { + content: ""; + } + pre, + blockquote { + border: 1px solid #999; + page-break-inside: avoid; + } + thead { + display: table-header-group; + } + tr, + img { + page-break-inside: avoid; + } + img { + max-width: 100% !important; + } + @page { + margin: 0.5cm; + } + p, + h2, + h3 { + orphans: 3; + widows: 3; + } + h2, + h3 { + page-break-after: avoid; + } +} .clearfix { *zoom: 1; } @@ -99,6 +174,7 @@ textarea { .clearfix:after { display: table; content: ""; + line-height: 0; } .clearfix:after { clear: both; @@ -113,28 +189,47 @@ textarea { .input-block-level { display: block; width: 100%; - min-height: 28px; + min-height: 30px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; } body { margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; - color: #4d4d4d; - background-color: #efefef; + font-size: 14px; + line-height: 20px; + color: #444444; + background-color: #eeeeee; } a { - color: #5b0404; + color: #810606; text-decoration: none; } -a:hover { - color: #120101; +a:hover, +a:focus { + color: #380303; text-decoration: underline; } +.img-rounded { + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.img-polaroid { + padding: 4px; + background-color: #fff; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); +} +.img-circle { + -webkit-border-radius: 500px; + -moz-border-radius: 500px; + border-radius: 500px; +} .row { margin-left: -20px; *zoom: 1; @@ -143,15 +238,18 @@ a:hover { .row:after { display: table; content: ""; + line-height: 0; } .row:after { clear: both; } [class*="span"] { float: left; + min-height: 1px; margin-left: 20px; } .container, +.navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 940px; @@ -236,6 +334,7 @@ a:hover { .row-fluid:after { display: table; content: ""; + line-height: 0; } .row-fluid:after { clear: both; @@ -243,65 +342,171 @@ a:hover { .row-fluid [class*="span"] { display: block; width: 100%; - min-height: 28px; + min-height: 30px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; float: left; - margin-left: 2.127659574%; - *margin-left: 2.0744680846382977%; + margin-left: 2.127659574468085%; + *margin-left: 2.074468085106383%; } .row-fluid [class*="span"]:first-child { margin-left: 0; } +.row-fluid .controls-row [class*="span"] + [class*="span"] { + margin-left: 2.127659574468085%; +} .row-fluid .span12 { - width: 99.99999998999999%; - *width: 99.94680850063828%; + width: 100%; + *width: 99.94680851063829%; } .row-fluid .span11 { - width: 91.489361693%; - *width: 91.4361702036383%; + width: 91.48936170212765%; + *width: 91.43617021276594%; } .row-fluid .span10 { - width: 82.97872339599999%; - *width: 82.92553190663828%; + width: 82.97872340425532%; + *width: 82.92553191489361%; } .row-fluid .span9 { - width: 74.468085099%; - *width: 74.4148936096383%; + width: 74.46808510638297%; + *width: 74.41489361702126%; } .row-fluid .span8 { - width: 65.95744680199999%; - *width: 65.90425531263828%; + width: 65.95744680851064%; + *width: 65.90425531914893%; } .row-fluid .span7 { - width: 57.446808505%; - *width: 57.3936170156383%; + width: 57.44680851063829%; + *width: 57.39361702127659%; } .row-fluid .span6 { - width: 48.93617020799999%; - *width: 48.88297871863829%; + width: 48.93617021276595%; + *width: 48.88297872340425%; } .row-fluid .span5 { - width: 40.425531911%; - *width: 40.3723404216383%; + width: 40.42553191489362%; + *width: 40.37234042553192%; } .row-fluid .span4 { - width: 31.914893614%; - *width: 31.8617021246383%; + width: 31.914893617021278%; + *width: 31.861702127659576%; } .row-fluid .span3 { - width: 23.404255317%; - *width: 23.3510638276383%; + width: 23.404255319148934%; + *width: 23.351063829787233%; } .row-fluid .span2 { - width: 14.89361702%; - *width: 14.8404255306383%; + width: 14.893617021276595%; + *width: 14.840425531914894%; } .row-fluid .span1 { - width: 6.382978723%; - *width: 6.329787233638298%; + width: 6.382978723404255%; + *width: 6.329787234042553%; +} +.row-fluid .offset12 { + margin-left: 104.25531914893617%; + *margin-left: 104.14893617021275%; +} +.row-fluid .offset12:first-child { + margin-left: 102.12765957446808%; + *margin-left: 102.02127659574467%; +} +.row-fluid .offset11 { + margin-left: 95.74468085106382%; + *margin-left: 95.6382978723404%; +} +.row-fluid .offset11:first-child { + margin-left: 93.61702127659574%; + *margin-left: 93.51063829787232%; +} +.row-fluid .offset10 { + margin-left: 87.23404255319149%; + *margin-left: 87.12765957446807%; +} +.row-fluid .offset10:first-child { + margin-left: 85.1063829787234%; + *margin-left: 84.99999999999999%; +} +.row-fluid .offset9 { + margin-left: 78.72340425531914%; + *margin-left: 78.61702127659572%; +} +.row-fluid .offset9:first-child { + margin-left: 76.59574468085106%; + *margin-left: 76.48936170212764%; +} +.row-fluid .offset8 { + margin-left: 70.2127659574468%; + *margin-left: 70.10638297872339%; +} +.row-fluid .offset8:first-child { + margin-left: 68.08510638297872%; + *margin-left: 67.9787234042553%; +} +.row-fluid .offset7 { + margin-left: 61.70212765957446%; + *margin-left: 61.59574468085106%; +} +.row-fluid .offset7:first-child { + margin-left: 59.574468085106375%; + *margin-left: 59.46808510638297%; +} +.row-fluid .offset6 { + margin-left: 53.191489361702125%; + *margin-left: 53.085106382978715%; +} +.row-fluid .offset6:first-child { + margin-left: 51.063829787234035%; + *margin-left: 50.95744680851063%; +} +.row-fluid .offset5 { + margin-left: 44.68085106382979%; + *margin-left: 44.57446808510638%; +} +.row-fluid .offset5:first-child { + margin-left: 42.5531914893617%; + *margin-left: 42.4468085106383%; +} +.row-fluid .offset4 { + margin-left: 36.170212765957444%; + *margin-left: 36.06382978723405%; +} +.row-fluid .offset4:first-child { + margin-left: 34.04255319148936%; + *margin-left: 33.93617021276596%; +} +.row-fluid .offset3 { + margin-left: 27.659574468085104%; + *margin-left: 27.5531914893617%; +} +.row-fluid .offset3:first-child { + margin-left: 25.53191489361702%; + *margin-left: 25.425531914893618%; +} +.row-fluid .offset2 { + margin-left: 19.148936170212764%; + *margin-left: 19.04255319148936%; +} +.row-fluid .offset2:first-child { + margin-left: 17.02127659574468%; + *margin-left: 16.914893617021278%; +} +.row-fluid .offset1 { + margin-left: 10.638297872340425%; + *margin-left: 10.53191489361702%; +} +.row-fluid .offset1:first-child { + margin-left: 8.51063829787234%; + *margin-left: 8.404255319148938%; +} +[class*="span"].hide, +.row-fluid [class*="span"].hide { + display: none; +} +[class*="span"].pull-right, +.row-fluid [class*="span"].pull-right { + float: right; } .container { margin-right: auto; @@ -312,6 +517,7 @@ a:hover { .container:after { display: table; content: ""; + line-height: 0; } .container:after { clear: both; @@ -325,25 +531,75 @@ a:hover { .container-fluid:after { display: table; content: ""; + line-height: 0; } .container-fluid:after { clear: both; } p { - margin: 0 0 9px; - font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; -} -p small { - font-size: 11px; - color: #999999; + margin: 0 0 10px; } .lead { - margin-bottom: 18px; - font-size: 20px; + margin-bottom: 20px; + font-size: 21px; font-weight: 200; - line-height: 27px; + line-height: 30px; +} +small { + font-size: 85%; +} +strong { + font-weight: bold; +} +em { + font-style: italic; +} +cite { + font-style: normal; +} +.muted { + color: #999999; +} +a.muted:hover, +a.muted:focus { + color: #808080; +} +.text-warning { + color: #c09853; +} +a.text-warning:hover, +a.text-warning:focus { + color: #a47e3c; +} +.text-error { + color: #b55457; +} +a.text-error:hover, +a.text-error:focus { + color: #954143; +} +.text-info { + color: #3a87ad; +} +a.text-info:hover, +a.text-info:focus { + color: #2d6987; +} +.text-success { + color: #468847; +} +a.text-success:hover, +a.text-success:focus { + color: #356635; +} +.text-left { + text-align: left; +} +.text-right { + text-align: right; +} +.text-center { + text-align: center; } h1, h2, @@ -351,9 +607,10 @@ h3, h4, h5, h6 { - margin: 0; + margin: 10px 0; font-family: inherit; font-weight: bold; + line-height: 20px; color: inherit; text-rendering: optimizelegibility; } @@ -364,60 +621,53 @@ h4 small, h5 small, h6 small { font-weight: normal; + line-height: 1; color: #999999; } -h1 { - font-size: 30px; - line-height: 36px; +h1, +h2, +h3 { + line-height: 40px; } -h1 small { - font-size: 18px; +h1 { + font-size: 38.5px; } h2 { - font-size: 24px; - line-height: 36px; -} -h2 small { - font-size: 18px; + font-size: 31.5px; } h3 { - font-size: 18px; - line-height: 27px; + font-size: 24.5px; } -h3 small { +h4 { + font-size: 17.5px; +} +h5 { font-size: 14px; } -h4, -h5, h6 { - line-height: 18px; + font-size: 11.9px; } -h4 { - font-size: 14px; +h1 small { + font-size: 24.5px; } -h4 small { - font-size: 12px; +h2 small { + font-size: 17.5px; } -h5 { - font-size: 12px; +h3 small { + font-size: 14px; } -h6 { - font-size: 11px; - color: #999999; - text-transform: uppercase; +h4 small { + font-size: 14px; } .page-header { - padding-bottom: 17px; - margin: 18px 0; + padding-bottom: 9px; + margin: 20px 0 30px; border-bottom: 1px solid #eeeeee; } -.page-header h1 { - line-height: 1; -} ul, ol { padding: 0; - margin: 0 0 9px 25px; + margin: 0 0 10px 25px; } ul ul, ul ol, @@ -425,37 +675,57 @@ ol ol, ol ul { margin-bottom: 0; } -ul { - list-style: disc; -} -ol { - list-style: decimal; -} li { - line-height: 18px; + line-height: 20px; } ul.unstyled, ol.unstyled { margin-left: 0; list-style: none; } +ul.inline, +ol.inline { + margin-left: 0; + list-style: none; +} +ul.inline > li, +ol.inline > li { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + padding-left: 5px; + padding-right: 5px; +} dl { - margin-bottom: 18px; + margin-bottom: 20px; } dt, dd { - line-height: 18px; + line-height: 20px; } dt { font-weight: bold; - line-height: 17px; } dd { - margin-left: 9px; + margin-left: 10px; +} +.dl-horizontal { + *zoom: 1; +} +.dl-horizontal:before, +.dl-horizontal:after { + display: table; + content: ""; + line-height: 0; +} +.dl-horizontal:after { + clear: both; } .dl-horizontal dt { float: left; - width: 120px; + width: 160px; clear: left; text-align: right; overflow: hidden; @@ -463,26 +733,18 @@ dd { white-space: nowrap; } .dl-horizontal dd { - margin-left: 130px; + margin-left: 180px; } hr { - margin: 18px 0; + margin: 20px 0; border: 0; border-top: 1px solid #eeeeee; border-bottom: 1px solid #ffffff; } -strong { - font-weight: bold; -} -em { - font-style: italic; -} -.muted { - color: #999999; -} -abbr[title] { +abbr[title], +abbr[data-original-title] { cursor: help; - border-bottom: 1px dotted #ddd; + border-bottom: 1px dotted #999999; } abbr.initialism { font-size: 90%; @@ -490,18 +752,18 @@ abbr.initialism { } blockquote { padding: 0 0 0 15px; - margin: 0 0 18px; + margin: 0 0 20px; border-left: 5px solid #eeeeee; } blockquote p { margin-bottom: 0; - font-size: 16px; + font-size: 17.5px; font-weight: 300; - line-height: 22.5px; + line-height: 1.25; } blockquote small { display: block; - line-height: 18px; + line-height: 20px; color: #999999; } blockquote small:before { @@ -518,6 +780,12 @@ blockquote.pull-right p, blockquote.pull-right small { text-align: right; } +blockquote.pull-right small:before { + content: ''; +} +blockquote.pull-right small:after { + content: '\00A0 \2014'; +} q:before, q:after, blockquote:before, @@ -526,20 +794,14 @@ blockquote:after { } address { display: block; - margin-bottom: 18px; - font-style: normal; - line-height: 18px; -} -small { - font-size: 100%; -} -cite { + margin-bottom: 20px; font-style: normal; + line-height: 20px; } code, pre { padding: 0 3px 2px; - font-family: Menlo, Monaco, Consolas, "Courier New", monospace; + font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 12px; color: #333333; -webkit-border-radius: 3px; @@ -551,13 +813,14 @@ code { color: #d14; background-color: #f7f7f9; border: 1px solid #e1e1e8; + white-space: nowrap; } pre { display: block; - padding: 8.5px; - margin: 0 0 9px; - font-size: 12.025px; - line-height: 18px; + padding: 9.5px; + margin: 0 0 10px; + font-size: 13px; + line-height: 20px; word-break: break-all; word-wrap: break-word; white-space: pre; @@ -570,11 +833,13 @@ pre { border-radius: 4px; } pre.prettyprint { - margin-bottom: 18px; + margin-bottom: 20px; } pre code { padding: 0; color: inherit; + white-space: pre; + white-space: pre-wrap; background-color: transparent; border: 0; } @@ -583,7 +848,7 @@ pre code { overflow-y: scroll; } form { - margin: 0 0 18px; + margin: 0 0 20px; } fieldset { padding: 0; @@ -594,15 +859,15 @@ legend { display: block; width: 100%; padding: 0; - margin-bottom: 27px; - font-size: 19.5px; - line-height: 36px; + margin-bottom: 20px; + font-size: 21px; + line-height: 40px; color: #333333; border: 0; - border-bottom: 1px solid #eee; + border-bottom: 1px solid #e5e5e5; } legend small { - font-size: 13.5px; + font-size: 15px; color: #999999; } label, @@ -610,9 +875,9 @@ input, button, select, textarea { - font-size: 13px; + font-size: 14px; font-weight: normal; - line-height: 18px; + line-height: 20px; } input, button, @@ -623,116 +888,181 @@ textarea { label { display: block; margin-bottom: 5px; - color: #333333; } -input, -textarea, select, +textarea, +input[type="text"], +input[type="password"], +input[type="datetime"], +input[type="datetime-local"], +input[type="date"], +input[type="month"], +input[type="time"], +input[type="week"], +input[type="number"], +input[type="email"], +input[type="url"], +input[type="search"], +input[type="tel"], +input[type="color"], .uneditable-input { display: inline-block; - width: 210px; - height: 18px; - padding: 4px; - margin-bottom: 9px; - font-size: 13px; - line-height: 18px; + height: 20px; + padding: 4px 6px; + margin-bottom: 10px; + font-size: 14px; + line-height: 20px; color: #555555; - background-color: #ffffff; - border: 1px solid #cccccc; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + vertical-align: middle; } -.uneditable-textarea { - width: auto; - height: auto; -} -label input, -label textarea, -label select { - display: block; +input, +textarea, +.uneditable-input { + width: 206px; } -input[type="image"], -input[type="checkbox"], -input[type="radio"] { - width: auto; +textarea { height: auto; - padding: 0; - margin: 3px 0; +} +textarea, +input[type="text"], +input[type="password"], +input[type="datetime"], +input[type="datetime-local"], +input[type="date"], +input[type="month"], +input[type="time"], +input[type="week"], +input[type="number"], +input[type="email"], +input[type="url"], +input[type="search"], +input[type="tel"], +input[type="color"], +.uneditable-input { + background-color: #ffffff; + border: 1px solid #cccccc; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border linear .2s, box-shadow linear .2s; + -moz-transition: border linear .2s, box-shadow linear .2s; + -o-transition: border linear .2s, box-shadow linear .2s; + transition: border linear .2s, box-shadow linear .2s; +} +textarea:focus, +input[type="text"]:focus, +input[type="password"]:focus, +input[type="datetime"]:focus, +input[type="datetime-local"]:focus, +input[type="date"]:focus, +input[type="month"]:focus, +input[type="time"]:focus, +input[type="week"]:focus, +input[type="number"]:focus, +input[type="email"]:focus, +input[type="url"]:focus, +input[type="search"]:focus, +input[type="tel"]:focus, +input[type="color"]:focus, +.uneditable-input:focus { + border-color: rgba(82, 168, 236, 0.8); + outline: 0; + outline: thin dotted \9; + /* IE6-9 */ + + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); +} +input[type="radio"], +input[type="checkbox"] { + margin: 4px 0 0; *margin-top: 0; /* IE7 */ - line-height: normal; - cursor: pointer; - background-color: transparent; - border: 0 \9; - /* IE9 and down */ + margin-top: 1px \9; + /* IE8-9 */ - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -input[type="image"] { - border: 0; -} -input[type="file"] { - width: auto; - padding: initial; - line-height: initial; - background-color: #ffffff; - background-color: initial; - border: initial; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; + line-height: normal; } -input[type="button"], +input[type="file"], +input[type="image"], +input[type="submit"], input[type="reset"], -input[type="submit"] { +input[type="button"], +input[type="radio"], +input[type="checkbox"] { width: auto; - height: auto; } select, input[type="file"] { - height: 28px; + height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ *margin-top: 4px; /* For IE7, add top margin to align select with labels */ - line-height: 28px; -} -input[type="file"] { - line-height: 18px \9; + line-height: 30px; } select { width: 220px; + border: 1px solid #cccccc; background-color: #ffffff; } select[multiple], select[size] { height: auto; } -input[type="image"] { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; +select:focus, +input[type="file"]:focus, +input[type="radio"]:focus, +input[type="checkbox"]:focus { + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; } -textarea { +.uneditable-input, +.uneditable-textarea { + color: #999999; + background-color: #fcfcfc; + border-color: #cccccc; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + cursor: not-allowed; +} +.uneditable-input { + overflow: hidden; + white-space: nowrap; +} +.uneditable-textarea { + width: auto; height: auto; } -input[type="hidden"] { - display: none; +input:-moz-placeholder, +textarea:-moz-placeholder { + color: #999999; +} +input:-ms-input-placeholder, +textarea:-ms-input-placeholder { + color: #999999; +} +input::-webkit-input-placeholder, +textarea::-webkit-input-placeholder { + color: #999999; } .radio, .checkbox { - min-height: 18px; - padding-left: 18px; + min-height: 20px; + padding-left: 20px; } .radio input[type="radio"], .checkbox input[type="checkbox"] { float: left; - margin-left: -18px; + margin-left: -20px; } .controls > .radio:first-child, .controls > .checkbox:first-child { @@ -749,39 +1079,6 @@ input[type="hidden"] { .checkbox.inline + .checkbox.inline { margin-left: 10px; } -input, -textarea { - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; -} -input:focus, -textarea:focus { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); -} -input[type="file"]:focus, -input[type="radio"]:focus, -input[type="checkbox"]:focus, -select:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} .input-mini { width: 60px; } @@ -811,46 +1108,105 @@ textarea[class*="span"], float: none; margin-left: 0; } +.input-append input[class*="span"], +.input-append .uneditable-input[class*="span"], +.input-prepend input[class*="span"], +.input-prepend .uneditable-input[class*="span"], +.row-fluid input[class*="span"], +.row-fluid select[class*="span"], +.row-fluid textarea[class*="span"], +.row-fluid .uneditable-input[class*="span"], +.row-fluid .input-prepend [class*="span"], +.row-fluid .input-append [class*="span"] { + display: inline-block; +} input, textarea, .uneditable-input { margin-left: 0; } -input.span12, textarea.span12, .uneditable-input.span12 { - width: 930px; -} -input.span11, textarea.span11, .uneditable-input.span11 { - width: 850px; -} -input.span10, textarea.span10, .uneditable-input.span10 { - width: 770px; -} -input.span9, textarea.span9, .uneditable-input.span9 { - width: 690px; -} -input.span8, textarea.span8, .uneditable-input.span8 { - width: 610px; -} -input.span7, textarea.span7, .uneditable-input.span7 { - width: 530px; -} -input.span6, textarea.span6, .uneditable-input.span6 { - width: 450px; +.controls-row [class*="span"] + [class*="span"] { + margin-left: 20px; } -input.span5, textarea.span5, .uneditable-input.span5 { - width: 370px; +input.span12, +textarea.span12, +.uneditable-input.span12 { + width: 926px; +} +input.span11, +textarea.span11, +.uneditable-input.span11 { + width: 846px; +} +input.span10, +textarea.span10, +.uneditable-input.span10 { + width: 766px; +} +input.span9, +textarea.span9, +.uneditable-input.span9 { + width: 686px; +} +input.span8, +textarea.span8, +.uneditable-input.span8 { + width: 606px; +} +input.span7, +textarea.span7, +.uneditable-input.span7 { + width: 526px; +} +input.span6, +textarea.span6, +.uneditable-input.span6 { + width: 446px; +} +input.span5, +textarea.span5, +.uneditable-input.span5 { + width: 366px; +} +input.span4, +textarea.span4, +.uneditable-input.span4 { + width: 286px; +} +input.span3, +textarea.span3, +.uneditable-input.span3 { + width: 206px; +} +input.span2, +textarea.span2, +.uneditable-input.span2 { + width: 126px; +} +input.span1, +textarea.span1, +.uneditable-input.span1 { + width: 46px; +} +.controls-row { + *zoom: 1; } -input.span4, textarea.span4, .uneditable-input.span4 { - width: 290px; +.controls-row:before, +.controls-row:after { + display: table; + content: ""; + line-height: 0; } -input.span3, textarea.span3, .uneditable-input.span3 { - width: 210px; +.controls-row:after { + clear: both; } -input.span2, textarea.span2, .uneditable-input.span2 { - width: 130px; +.controls-row [class*="span"], +.row-fluid .controls-row [class*="span"] { + float: left; } -input.span1, textarea.span1, .uneditable-input.span1 { - width: 50px; +.controls-row .checkbox[class*="span"], +.controls-row .radio[class*="span"] { + padding-top: 5px; } input[disabled], select[disabled], @@ -860,7 +1216,6 @@ select[readonly], textarea[readonly] { cursor: not-allowed; background-color: #eeeeee; - border-color: #ddd; } input[type="radio"][disabled], input[type="checkbox"][disabled], @@ -868,24 +1223,33 @@ input[type="radio"][readonly], input[type="checkbox"][readonly] { background-color: transparent; } -.control-group.warning > label, +.control-group.warning .control-label, .control-group.warning .help-block, .control-group.warning .help-inline { color: #c09853; } +.control-group.warning .checkbox, +.control-group.warning .radio, .control-group.warning input, .control-group.warning select, .control-group.warning textarea { color: #c09853; +} +.control-group.warning input, +.control-group.warning select, +.control-group.warning textarea { border-color: #c09853; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { border-color: #a47e3c; - -webkit-box-shadow: 0 0 6px #dbc59e; - -moz-box-shadow: 0 0 6px #dbc59e; - box-shadow: 0 0 6px #dbc59e; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; } .control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { @@ -893,24 +1257,33 @@ input[type="checkbox"][readonly] { background-color: #fcf8e3; border-color: #c09853; } -.control-group.error > label, +.control-group.error .control-label, .control-group.error .help-block, .control-group.error .help-inline { color: #b55457; } +.control-group.error .checkbox, +.control-group.error .radio, .control-group.error input, .control-group.error select, .control-group.error textarea { color: #b55457; +} +.control-group.error input, +.control-group.error select, +.control-group.error textarea { border-color: #b55457; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus { border-color: #954143; - -webkit-box-shadow: 0 0 6px #d49b9d; - -moz-box-shadow: 0 0 6px #d49b9d; - box-shadow: 0 0 6px #d49b9d; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d49b9d; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d49b9d; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d49b9d; } .control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { @@ -918,24 +1291,33 @@ input[type="checkbox"][readonly] { background-color: #f8f0f0; border-color: #b55457; } -.control-group.success > label, +.control-group.success .control-label, .control-group.success .help-block, .control-group.success .help-inline { color: #468847; } +.control-group.success .checkbox, +.control-group.success .radio, .control-group.success input, .control-group.success select, .control-group.success textarea { color: #468847; +} +.control-group.success input, +.control-group.success select, +.control-group.success textarea { border-color: #468847; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus { border-color: #356635; - -webkit-box-shadow: 0 0 6px #7aba7b; - -moz-box-shadow: 0 0 6px #7aba7b; - box-shadow: 0 0 6px #7aba7b; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; } .control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { @@ -943,59 +1325,78 @@ input[type="checkbox"][readonly] { background-color: #dff0d8; border-color: #468847; } -input:focus:required:invalid, -textarea:focus:required:invalid, -select:focus:required:invalid { +.control-group.info .control-label, +.control-group.info .help-block, +.control-group.info .help-inline { + color: #3a87ad; +} +.control-group.info .checkbox, +.control-group.info .radio, +.control-group.info input, +.control-group.info select, +.control-group.info textarea { + color: #3a87ad; +} +.control-group.info input, +.control-group.info select, +.control-group.info textarea { + border-color: #3a87ad; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); +} +.control-group.info input:focus, +.control-group.info select:focus, +.control-group.info textarea:focus { + border-color: #2d6987; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; +} +.control-group.info .input-prepend .add-on, +.control-group.info .input-append .add-on { + color: #3a87ad; + background-color: #d9edf7; + border-color: #3a87ad; +} +input:focus:invalid, +textarea:focus:invalid, +select:focus:invalid { color: #b94a48; border-color: #ee5f5b; } -input:focus:required:invalid:focus, -textarea:focus:required:invalid:focus, -select:focus:required:invalid:focus { +input:focus:invalid:focus, +textarea:focus:invalid:focus, +select:focus:invalid:focus { border-color: #e9322d; -webkit-box-shadow: 0 0 6px #f8b9b7; -moz-box-shadow: 0 0 6px #f8b9b7; box-shadow: 0 0 6px #f8b9b7; } .form-actions { - padding: 17px 20px 18px; - margin-top: 18px; - margin-bottom: 18px; + padding: 19px 20px 20px; + margin-top: 20px; + margin-bottom: 20px; background-color: #f5f5f5; - border-top: 1px solid #ddd; + border-top: 1px solid #e5e5e5; *zoom: 1; } .form-actions:before, .form-actions:after { display: table; content: ""; + line-height: 0; } .form-actions:after { clear: both; } -.uneditable-input { - overflow: hidden; - white-space: nowrap; - cursor: not-allowed; - background-color: #ffffff; - border-color: #eee; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -} -:-moz-placeholder { - color: #999999; -} -::-webkit-input-placeholder { - color: #999999; -} .help-block, .help-inline { - color: #555555; + color: #6a6a6a; } .help-block { display: block; - margin-bottom: 9px; + margin-bottom: 10px; } .help-inline { display: inline-block; @@ -1006,62 +1407,76 @@ select:focus:required:invalid:focus { vertical-align: middle; padding-left: 5px; } -.input-prepend, -.input-append { - margin-bottom: 5px; +.input-append, +.input-prepend { + display: inline-block; + margin-bottom: 10px; + vertical-align: middle; + font-size: 0; + white-space: nowrap; } -.input-prepend input, .input-append input, -.input-prepend select, +.input-prepend input, .input-append select, +.input-prepend select, +.input-append .uneditable-input, .input-prepend .uneditable-input, -.input-append .uneditable-input { +.input-append .dropdown-menu, +.input-prepend .dropdown-menu, +.input-append .popover, +.input-prepend .popover { + font-size: 14px; +} +.input-append input, +.input-prepend input, +.input-append select, +.input-prepend select, +.input-append .uneditable-input, +.input-prepend .uneditable-input { position: relative; margin-bottom: 0; *margin-left: 0; - vertical-align: middle; + vertical-align: top; -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } -.input-prepend input:focus, .input-append input:focus, -.input-prepend select:focus, +.input-prepend input:focus, .input-append select:focus, -.input-prepend .uneditable-input:focus, -.input-append .uneditable-input:focus { +.input-prepend select:focus, +.input-append .uneditable-input:focus, +.input-prepend .uneditable-input:focus { z-index: 2; } -.input-prepend .uneditable-input, -.input-append .uneditable-input { - border-left-color: #ccc; -} -.input-prepend .add-on, -.input-append .add-on { +.input-append .add-on, +.input-prepend .add-on { display: inline-block; width: auto; - height: 18px; + height: 20px; min-width: 16px; padding: 4px 5px; + font-size: 14px; font-weight: normal; - line-height: 18px; + line-height: 20px; text-align: center; text-shadow: 0 1px 0 #ffffff; - vertical-align: middle; background-color: #eeeeee; border: 1px solid #ccc; } -.input-prepend .add-on, .input-append .add-on, +.input-prepend .add-on, +.input-append .btn, .input-prepend .btn, -.input-append .btn { - margin-left: -1px; +.input-append .btn-group > .dropdown-toggle, +.input-prepend .btn-group > .dropdown-toggle { + vertical-align: top; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } -.input-prepend .active, -.input-append .active { +.input-append .active, +.input-prepend .active { background-color: #a9dba9; border-color: #46a546; } @@ -1082,12 +1497,21 @@ select:focus:required:invalid:focus { -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } -.input-append .uneditable-input { - border-right-color: #ccc; - border-left-color: #eee; +.input-append input + .btn-group .btn:last-child, +.input-append select + .btn-group .btn:last-child, +.input-append .uneditable-input + .btn-group .btn:last-child { + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; +} +.input-append .add-on, +.input-append .btn, +.input-append .btn-group { + margin-left: -1px; } .input-append .add-on:last-child, -.input-append .btn:last-child { +.input-append .btn:last-child, +.input-append .btn-group:last-child > .dropdown-toggle { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; @@ -1099,6 +1523,13 @@ select:focus:required:invalid:focus { -moz-border-radius: 0; border-radius: 0; } +.input-prepend.input-append input + .btn-group .btn, +.input-prepend.input-append select + .btn-group .btn, +.input-prepend.input-append .uneditable-input + .btn-group .btn { + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; +} .input-prepend.input-append .add-on:first-child, .input-prepend.input-append .btn:first-child { margin-right: -1px; @@ -1113,7 +1544,10 @@ select:focus:required:invalid:focus { -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } -.search-query { +.input-prepend.input-append .btn-group:first-child { + margin-left: 0; +} +input.search-query { padding-right: 14px; padding-right: 4px \9; padding-left: 14px; @@ -1121,9 +1555,36 @@ select:focus:required:invalid:focus { /* IE7-8 doesn't have border-radius, so don't indent the padding */ margin-bottom: 0; - -webkit-border-radius: 14px; - -moz-border-radius: 14px; - border-radius: 14px; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; +} +/* Allow for input prepend/append in search forms */ +.form-search .input-append .search-query, +.form-search .input-prepend .search-query { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.form-search .input-append .search-query { + -webkit-border-radius: 14px 0 0 14px; + -moz-border-radius: 14px 0 0 14px; + border-radius: 14px 0 0 14px; +} +.form-search .input-append .btn { + -webkit-border-radius: 0 14px 14px 0; + -moz-border-radius: 0 14px 14px 0; + border-radius: 0 14px 14px 0; +} +.form-search .input-prepend .search-query { + -webkit-border-radius: 0 14px 14px 0; + -moz-border-radius: 0 14px 14px 0; + border-radius: 0 14px 14px 0; +} +.form-search .input-prepend .btn { + -webkit-border-radius: 14px 0 0 14px; + -moz-border-radius: 14px 0 0 14px; + border-radius: 14px 0 0 14px; } .form-search input, .form-inline input, @@ -1152,6 +1613,7 @@ select:focus:required:invalid:focus { *zoom: 1; margin-bottom: 0; + vertical-align: middle; } .form-search .hide, .form-inline .hide, @@ -1159,7 +1621,9 @@ select:focus:required:invalid:focus { display: none; } .form-search label, -.form-inline label { +.form-inline label, +.form-search .btn-group, +.form-inline .btn-group { display: inline-block; } .form-search .input-append, @@ -1185,45 +1649,53 @@ select:focus:required:invalid:focus { margin-left: 0; } .control-group { - margin-bottom: 9px; + margin-bottom: 10px; } legend + .control-group { - margin-top: 18px; + margin-top: 20px; -webkit-margin-top-collapse: separate; } .form-horizontal .control-group { - margin-bottom: 18px; + margin-bottom: 20px; *zoom: 1; } .form-horizontal .control-group:before, .form-horizontal .control-group:after { display: table; content: ""; + line-height: 0; } .form-horizontal .control-group:after { clear: both; } .form-horizontal .control-label { float: left; - width: 140px; + width: 160px; padding-top: 5px; text-align: right; } .form-horizontal .controls { *display: inline-block; *padding-left: 20px; - margin-left: 160px; + margin-left: 180px; *margin-left: 0; } .form-horizontal .controls:first-child { - *padding-left: 160px; + *padding-left: 180px; } .form-horizontal .help-block { - margin-top: 9px; margin-bottom: 0; } +.form-horizontal input + .help-block, +.form-horizontal select + .help-block, +.form-horizontal textarea + .help-block, +.form-horizontal .uneditable-input + .help-block, +.form-horizontal .input-prepend + .help-block, +.form-horizontal .input-append + .help-block { + margin-top: 10px; +} .form-horizontal .form-actions { - padding-left: 160px; + padding-left: 180px; } table { max-width: 100%; @@ -1233,12 +1705,12 @@ table { } .table { width: 100%; - margin-bottom: 18px; + margin-bottom: 20px; } .table th, .table td { padding: 8px; - line-height: 18px; + line-height: 20px; text-align: left; vertical-align: top; border-top: 1px solid #dddddd; @@ -1260,6 +1732,9 @@ table { .table tbody + tbody { border-top: 2px solid #dddddd; } +.table .table { + background-color: #eeeeee; +} .table-condensed th, .table-condensed td { padding: 4px 5px; @@ -1267,7 +1742,7 @@ table { .table-bordered { border: 1px solid #dddddd; border-collapse: separate; - *border-collapse: collapsed; + *border-collapse: collapse; border-left: 0; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -1288,160 +1763,175 @@ table { .table-bordered tbody:first-child tr:first-child td { border-top: 0; } -.table-bordered thead:first-child tr:first-child th:first-child, -.table-bordered tbody:first-child tr:first-child td:first-child { +.table-bordered thead:first-child tr:first-child > th:first-child, +.table-bordered tbody:first-child tr:first-child > td:first-child, +.table-bordered tbody:first-child tr:first-child > th:first-child { -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; } -.table-bordered thead:first-child tr:first-child th:last-child, -.table-bordered tbody:first-child tr:first-child td:last-child { +.table-bordered thead:first-child tr:first-child > th:last-child, +.table-bordered tbody:first-child tr:first-child > td:last-child, +.table-bordered tbody:first-child tr:first-child > th:last-child { -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; } -.table-bordered thead:last-child tr:last-child th:first-child, -.table-bordered tbody:last-child tr:last-child td:first-child { - -webkit-border-radius: 0 0 0 4px; - -moz-border-radius: 0 0 0 4px; - border-radius: 0 0 0 4px; +.table-bordered thead:last-child tr:last-child > th:first-child, +.table-bordered tbody:last-child tr:last-child > td:first-child, +.table-bordered tbody:last-child tr:last-child > th:first-child, +.table-bordered tfoot:last-child tr:last-child > td:first-child, +.table-bordered tfoot:last-child tr:last-child > th:first-child { -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } -.table-bordered thead:last-child tr:last-child th:last-child, -.table-bordered tbody:last-child tr:last-child td:last-child { +.table-bordered thead:last-child tr:last-child > th:last-child, +.table-bordered tbody:last-child tr:last-child > td:last-child, +.table-bordered tbody:last-child tr:last-child > th:last-child, +.table-bordered tfoot:last-child tr:last-child > td:last-child, +.table-bordered tfoot:last-child tr:last-child > th:last-child { -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; } -.table-striped tbody tr:nth-child(odd) td, -.table-striped tbody tr:nth-child(odd) th { +.table-bordered tfoot + tbody:last-child tr:last-child td:first-child { + -webkit-border-bottom-left-radius: 0; + -moz-border-radius-bottomleft: 0; + border-bottom-left-radius: 0; +} +.table-bordered tfoot + tbody:last-child tr:last-child td:last-child { + -webkit-border-bottom-right-radius: 0; + -moz-border-radius-bottomright: 0; + border-bottom-right-radius: 0; +} +.table-bordered caption + thead tr:first-child th:first-child, +.table-bordered caption + tbody tr:first-child td:first-child, +.table-bordered colgroup + thead tr:first-child th:first-child, +.table-bordered colgroup + tbody tr:first-child td:first-child { + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; +} +.table-bordered caption + thead tr:first-child th:last-child, +.table-bordered caption + tbody tr:first-child td:last-child, +.table-bordered colgroup + thead tr:first-child th:last-child, +.table-bordered colgroup + tbody tr:first-child td:last-child { + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; +} +.table-striped tbody > tr:nth-child(odd) > td, +.table-striped tbody > tr:nth-child(odd) > th { background-color: #f9f9f9; } -.table tbody tr:hover td, -.table tbody tr:hover th { +.table-hover tbody tr:hover > td, +.table-hover tbody tr:hover > th { background-color: #f5f5f5; } -table .span1 { +table td[class*="span"], +table th[class*="span"], +.row-fluid table td[class*="span"], +.row-fluid table th[class*="span"] { + display: table-cell; + float: none; + margin-left: 0; +} +.table td.span1, +.table th.span1 { float: none; width: 44px; margin-left: 0; } -table .span2 { +.table td.span2, +.table th.span2 { float: none; width: 124px; margin-left: 0; } -table .span3 { +.table td.span3, +.table th.span3 { float: none; width: 204px; margin-left: 0; } -table .span4 { +.table td.span4, +.table th.span4 { float: none; width: 284px; margin-left: 0; } -table .span5 { +.table td.span5, +.table th.span5 { float: none; width: 364px; margin-left: 0; } -table .span6 { +.table td.span6, +.table th.span6 { float: none; width: 444px; margin-left: 0; } -table .span7 { +.table td.span7, +.table th.span7 { float: none; width: 524px; margin-left: 0; } -table .span8 { +.table td.span8, +.table th.span8 { float: none; width: 604px; margin-left: 0; } -table .span9 { +.table td.span9, +.table th.span9 { float: none; width: 684px; margin-left: 0; } -table .span10 { +.table td.span10, +.table th.span10 { float: none; width: 764px; margin-left: 0; } -table .span11 { +.table td.span11, +.table th.span11 { float: none; width: 844px; margin-left: 0; } -table .span12 { +.table td.span12, +.table th.span12 { float: none; width: 924px; margin-left: 0; } -table .span13 { - float: none; - width: 1004px; - margin-left: 0; -} -table .span14 { - float: none; - width: 1084px; - margin-left: 0; -} -table .span15 { - float: none; - width: 1164px; - margin-left: 0; -} -table .span16 { - float: none; - width: 1244px; - margin-left: 0; -} -table .span17 { - float: none; - width: 1324px; - margin-left: 0; +.table tbody tr.success > td { + background-color: #dff0d8; } -table .span18 { - float: none; - width: 1404px; - margin-left: 0; +.table tbody tr.error > td { + background-color: #f8f0f0; } -table .span19 { - float: none; - width: 1484px; - margin-left: 0; +.table tbody tr.warning > td { + background-color: #fcf8e3; } -table .span20 { - float: none; - width: 1564px; - margin-left: 0; +.table tbody tr.info > td { + background-color: #d9edf7; } -table .span21 { - float: none; - width: 1644px; - margin-left: 0; +.table-hover tbody tr.success:hover > td { + background-color: #d0e9c6; } -table .span22 { - float: none; - width: 1724px; - margin-left: 0; +.table-hover tbody tr.error:hover > td { + background-color: #f0dfe0; } -table .span23 { - float: none; - width: 1804px; - margin-left: 0; +.table-hover tbody tr.warning:hover > td { + background-color: #faf2cc; } -table .span24 { - float: none; - width: 1884px; - margin-left: 0; +.table-hover tbody tr.info:hover > td { + background-color: #c4e3f3; } .dropup, .dropdown { @@ -1463,18 +1953,11 @@ table .span24 { border-right: 4px solid transparent; border-left: 4px solid transparent; content: ""; - opacity: 0.3; - filter: alpha(opacity=30); } .dropdown .caret { margin-top: 8px; margin-left: 2px; } -.dropdown:hover .caret, -.open .caret { - opacity: 1; - filter: alpha(opacity=100); -} .dropdown-menu { position: absolute; top: 100%; @@ -1483,17 +1966,17 @@ table .span24 { display: none; float: left; min-width: 160px; - padding: 4px 0; - margin: 1px 0 0; + padding: 5px 0; + margin: 2px 0 0; list-style: none; background-color: #ffffff; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); *border-right-width: 2px; *border-bottom-width: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); @@ -1508,35 +1991,71 @@ table .span24 { .dropdown-menu .divider { *width: 100%; height: 1px; - margin: 8px 1px; + margin: 9px 1px; *margin: -5px 0 5px; overflow: hidden; background-color: #e5e5e5; border-bottom: 1px solid #ffffff; } -.dropdown-menu a { +.dropdown-menu > li > a { display: block; - padding: 3px 15px; + padding: 3px 20px; clear: both; font-weight: normal; - line-height: 18px; + line-height: 20px; color: #333333; white-space: nowrap; } -.dropdown-menu li > a:hover, -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { +.dropdown-menu > li > a:hover, +.dropdown-menu > li > a:focus, +.dropdown-submenu:hover > a, +.dropdown-submenu:focus > a { + text-decoration: none; + color: #ffffff; + background-color: #770606; + background-image: -moz-linear-gradient(top, #810606, #690505); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#810606), to(#690505)); + background-image: -webkit-linear-gradient(top, #810606, #690505); + background-image: -o-linear-gradient(top, #810606, #690505); + background-image: linear-gradient(to bottom, #810606, #690505); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff810606', endColorstr='#ff690505', GradientType=0); +} +.dropdown-menu > .active > a, +.dropdown-menu > .active > a:hover, +.dropdown-menu > .active > a:focus { color: #ffffff; text-decoration: none; - background-color: #5b0404; + outline: 0; + background-color: #770606; + background-image: -moz-linear-gradient(top, #810606, #690505); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#810606), to(#690505)); + background-image: -webkit-linear-gradient(top, #810606, #690505); + background-image: -o-linear-gradient(top, #810606, #690505); + background-image: linear-gradient(to bottom, #810606, #690505); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff810606', endColorstr='#ff690505', GradientType=0); +} +.dropdown-menu > .disabled > a, +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { + color: #999999; +} +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { + text-decoration: none; + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + cursor: default; } .open { *z-index: 1000; } -.open .dropdown-menu { +.open > .dropdown-menu { display: block; } -.pull-right .dropdown-menu { +.pull-right > .dropdown-menu { right: 0; left: auto; } @@ -1544,7 +2063,7 @@ table .span24 { .navbar-fixed-bottom .dropdown .caret { border-top: 0; border-bottom: 4px solid #000000; - content: "\2191"; + content: ""; } .dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { @@ -1552,7 +2071,62 @@ table .span24 { bottom: 100%; margin-bottom: 1px; } +.dropdown-submenu { + position: relative; +} +.dropdown-submenu > .dropdown-menu { + top: 0; + left: 100%; + margin-top: -6px; + margin-left: -1px; + -webkit-border-radius: 0 6px 6px 6px; + -moz-border-radius: 0 6px 6px 6px; + border-radius: 0 6px 6px 6px; +} +.dropdown-submenu:hover > .dropdown-menu { + display: block; +} +.dropup .dropdown-submenu > .dropdown-menu { + top: auto; + bottom: 0; + margin-top: 0; + margin-bottom: -2px; + -webkit-border-radius: 5px 5px 5px 0; + -moz-border-radius: 5px 5px 5px 0; + border-radius: 5px 5px 5px 0; +} +.dropdown-submenu > a:after { + display: block; + content: " "; + float: right; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; + border-width: 5px 0 5px 5px; + border-left-color: #cccccc; + margin-top: 5px; + margin-right: -10px; +} +.dropdown-submenu:hover > a:after { + border-left-color: #ffffff; +} +.dropdown-submenu.pull-left { + float: none; +} +.dropdown-submenu.pull-left > .dropdown-menu { + left: -100%; + margin-left: 10px; + -webkit-border-radius: 6px 0 6px 6px; + -moz-border-radius: 6px 0 6px 6px; + border-radius: 6px 0 6px 6px; +} +.dropdown .dropdown-menu .nav-header { + padding-left: 20px; + padding-right: 20px; +} .typeahead { + z-index: 1051; margin-top: 2px; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -1563,8 +2137,7 @@ table .span24 { padding: 19px; margin-bottom: 20px; background-color: #f5f5f5; - border: 1px solid #eee; - border: 1px solid rgba(0, 0, 0, 0.05); + border: 1px solid #e3e3e3; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -1590,16 +2163,13 @@ table .span24 { } .fade { opacity: 0; - filter: alpha(opacity=0); -webkit-transition: opacity 0.15s linear; -moz-transition: opacity 0.15s linear; - -ms-transition: opacity 0.15s linear; -o-transition: opacity 0.15s linear; transition: opacity 0.15s linear; } .fade.in { opacity: 1; - filter: alpha(opacity=100); } .collapse { position: relative; @@ -1607,7 +2177,6 @@ table .span24 { overflow: hidden; -webkit-transition: height 0.35s ease; -moz-transition: height 0.35s ease; - -ms-transition: height 0.35s ease; -o-transition: height 0.35s ease; transition: height 0.35s ease; } @@ -1618,13 +2187,14 @@ table .span24 { float: right; font-size: 20px; font-weight: bold; - line-height: 18px; + line-height: 20px; color: #000000; text-shadow: 0 1px 0 #ffffff; opacity: 0.2; filter: alpha(opacity=20); } -.close:hover { +.close:hover, +.close:focus { color: #000000; text-decoration: none; cursor: pointer; @@ -1644,25 +2214,23 @@ button.close { /* IE7 inline-block hack */ *zoom: 1; - padding: 4px 10px 4px; + padding: 4px 12px; margin-bottom: 0; - font-size: 13px; - line-height: 18px; - *line-height: 20px; - color: #333333; + font-size: 14px; + line-height: 20px; text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); vertical-align: middle; cursor: pointer; + color: #333333; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); background-color: #f7f7f7; background-image: -moz-linear-gradient(top, #ffffff, #eaeaea); - background-image: -ms-linear-gradient(top, #ffffff, #eaeaea); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#eaeaea)); background-image: -webkit-linear-gradient(top, #ffffff, #eaeaea); background-image: -o-linear-gradient(top, #ffffff, #eaeaea); - background-image: linear-gradient(top, #ffffff, #eaeaea); + background-image: linear-gradient(to bottom, #ffffff, #eaeaea); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#eaeaea', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeaeaea', GradientType=0); border-color: #eaeaea #eaeaea #c4c4c4; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #eaeaea; @@ -1681,10 +2249,12 @@ button.close { box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); } .btn:hover, +.btn:focus, .btn:active, .btn.active, .btn.disabled, .btn[disabled] { + color: #333333; background-color: #eaeaea; *background-color: #dddddd; } @@ -1695,17 +2265,13 @@ button.close { .btn:first-child { *margin-left: 0; } -.btn:hover { +.btn:hover, +.btn:focus { color: #333333; text-decoration: none; - background-color: #e6e6e6; - *background-color: #d9d9d9; - /* Buttons in IE7 don't get borders, so darken on hover */ - background-position: 0 -15px; -webkit-transition: background-position 0.1s linear; -moz-transition: background-position 0.1s linear; - -ms-transition: background-position 0.1s linear; -o-transition: background-position 0.1s linear; transition: background-position 0.1s linear; } @@ -1716,8 +2282,6 @@ button.close { } .btn.active, .btn:active { - background-color: #e6e6e6; - background-color: #d9d9d9 \9; background-image: none; outline: 0; -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); @@ -1727,7 +2291,6 @@ button.close { .btn.disabled, .btn[disabled] { cursor: default; - background-color: #e6e6e6; background-image: none; opacity: 0.65; filter: alpha(opacity=65); @@ -1736,43 +2299,54 @@ button.close { box-shadow: none; } .btn-large { - padding: 9px 14px; - font-size: 15px; - line-height: normal; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; + padding: 11px 19px; + font-size: 17.5px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } -.btn-large [class^="icon-"] { - margin-top: 1px; +.btn-large [class^="icon-"], +.btn-large [class*=" icon-"] { + margin-top: 4px; } .btn-small { - padding: 5px 9px; - font-size: 11px; - line-height: 16px; + padding: 2px 10px; + font-size: 11.9px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +.btn-small [class^="icon-"], +.btn-small [class*=" icon-"] { + margin-top: 0; } -.btn-small [class^="icon-"] { +.btn-mini [class^="icon-"], +.btn-mini [class*=" icon-"] { margin-top: -1px; } .btn-mini { - padding: 2px 6px; - font-size: 11px; - line-height: 14px; + padding: 0 6px; + font-size: 10.5px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.btn-primary, -.btn-primary:hover, -.btn-warning, -.btn-warning:hover, -.btn-danger, -.btn-danger:hover, -.btn-success, -.btn-success:hover, -.btn-info, -.btn-info:hover, -.btn-inverse, -.btn-inverse:hover { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +.btn-block { + display: block; + width: 100%; + padding-left: 0; + padding-right: 0; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.btn-block + .btn-block { + margin-top: 5px; +} +input[type="submit"].btn-block, +input[type="reset"].btn-block, +input[type="button"].btn-block { + width: 100%; } .btn-primary.active, .btn-warning.active, @@ -1782,49 +2356,49 @@ button.close { .btn-inverse.active { color: rgba(255, 255, 255, 0.75); } -.btn { - border-color: #ccc; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} .btn-primary { - background-color: #dd0c0c; - background-image: -moz-linear-gradient(top, #cf0a0a, #f21010); - background-image: -ms-linear-gradient(top, #cf0a0a, #f21010); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cf0a0a), to(#f21010)); - background-image: -webkit-linear-gradient(top, #cf0a0a, #f21010); - background-image: -o-linear-gradient(top, #cf0a0a, #f21010); - background-image: linear-gradient(top, #cf0a0a, #f21010); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #9e0707; + background-image: -moz-linear-gradient(top, #b20808, #810606); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b20808), to(#810606)); + background-image: -webkit-linear-gradient(top, #b20808, #810606); + background-image: -o-linear-gradient(top, #b20808, #810606); + background-image: linear-gradient(to bottom, #b20808, #810606); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cf0a0a', endColorstr='#f21010', GradientType=0); - border-color: #f21010 #f21010 #ac0909; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb20808', endColorstr='#ff810606', GradientType=0); + border-color: #810606 #810606 #380303; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #f21010; + *background-color: #810606; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-primary:hover, +.btn-primary:focus, .btn-primary:active, .btn-primary.active, .btn-primary.disabled, .btn-primary[disabled] { - background-color: #f21010; - *background-color: #dd0c0c; + color: #ffffff; + background-color: #810606; + *background-color: #690505; } .btn-primary:active, .btn-primary.active { - background-color: #c40b0b \9; + background-color: #500404 \9; } .btn-warning { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #faa732; background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-linear-gradient(top, #fbb450, #f89406); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); background-image: -webkit-linear-gradient(top, #fbb450, #f89406); background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(top, #fbb450, #f89406); + background-image: linear-gradient(to bottom, #fbb450, #f89406); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); border-color: #f89406 #f89406 #ad6704; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #f89406; @@ -1833,10 +2407,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-warning:hover, +.btn-warning:focus, .btn-warning:active, .btn-warning.active, .btn-warning.disabled, .btn-warning[disabled] { + color: #ffffff; background-color: #f89406; *background-color: #df8505; } @@ -1845,15 +2421,16 @@ button.close { background-color: #c67605 \9; } .btn-danger { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #da4f49; background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(top, #ee5f5b, #bd362f); + background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0); border-color: #bd362f #bd362f #802420; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #bd362f; @@ -1862,10 +2439,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-danger:hover, +.btn-danger:focus, .btn-danger:active, .btn-danger.active, .btn-danger.disabled, .btn-danger[disabled] { + color: #ffffff; background-color: #bd362f; *background-color: #a9302a; } @@ -1874,15 +2453,16 @@ button.close { background-color: #942a25 \9; } .btn-success { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #5bb75b; background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-linear-gradient(top, #62c462, #51a351); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); background-image: -webkit-linear-gradient(top, #62c462, #51a351); background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(top, #62c462, #51a351); + background-image: linear-gradient(to bottom, #62c462, #51a351); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0); border-color: #51a351 #51a351 #387038; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #51a351; @@ -1891,10 +2471,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-success:hover, +.btn-success:focus, .btn-success:active, .btn-success.active, .btn-success.disabled, .btn-success[disabled] { + color: #ffffff; background-color: #51a351; *background-color: #499249; } @@ -1903,15 +2485,16 @@ button.close { background-color: #408140 \9; } .btn-info { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #49afcd; background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(top, #5bc0de, #2f96b4); + background-image: linear-gradient(to bottom, #5bc0de, #2f96b4); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0); border-color: #2f96b4 #2f96b4 #1f6377; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #2f96b4; @@ -1920,10 +2503,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-info:hover, +.btn-info:focus, .btn-info:active, .btn-info.active, .btn-info.disabled, .btn-info[disabled] { + color: #ffffff; background-color: #2f96b4; *background-color: #2a85a0; } @@ -1932,15 +2517,16 @@ button.close { background-color: #24748c \9; } .btn-inverse { - background-color: #414141; - background-image: -moz-linear-gradient(top, #555555, #222222); - background-image: -ms-linear-gradient(top, #555555, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); - background-image: -webkit-linear-gradient(top, #555555, #222222); - background-image: -o-linear-gradient(top, #555555, #222222); - background-image: linear-gradient(top, #555555, #222222); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #363636; + background-image: -moz-linear-gradient(top, #444444, #222222); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222)); + background-image: -webkit-linear-gradient(top, #444444, #222222); + background-image: -o-linear-gradient(top, #444444, #222222); + background-image: linear-gradient(to bottom, #444444, #222222); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0); border-color: #222222 #222222 #000000; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #222222; @@ -1949,10 +2535,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-inverse:hover, +.btn-inverse:focus, .btn-inverse:active, .btn-inverse.active, .btn-inverse.disabled, .btn-inverse[disabled] { + color: #ffffff; background-color: #222222; *background-color: #151515; } @@ -1962,8 +2550,8 @@ button.close { } button.btn, input[type="submit"].btn { - *padding-top: 2px; - *padding-bottom: 2px; + *padding-top: 3px; + *padding-bottom: 3px; } button.btn::-moz-focus-inner, input[type="submit"].btn::-moz-focus-inner { @@ -1985,19 +2573,46 @@ input[type="submit"].btn.btn-mini { *padding-top: 1px; *padding-bottom: 1px; } +.btn-link, +.btn-link:active, +.btn-link[disabled] { + background-color: transparent; + background-image: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} +.btn-link { + border-color: transparent; + cursor: pointer; + color: #810606; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.btn-link:hover, +.btn-link:focus { + color: #380303; + text-decoration: underline; + background-color: transparent; +} +.btn-link[disabled]:hover, +.btn-link[disabled]:focus { + color: #333333; + text-decoration: none; +} .btn-group { position: relative; + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + *zoom: 1; + font-size: 0; + vertical-align: middle; + white-space: nowrap; *margin-left: .3em; } -.btn-group:before, -.btn-group:after { - display: table; - content: ""; -} -.btn-group:after { - clear: both; -} .btn-group:first-child { *margin-left: 0; } @@ -2005,24 +2620,38 @@ input[type="submit"].btn.btn-mini { margin-left: 5px; } .btn-toolbar { - margin-top: 9px; - margin-bottom: 9px; + font-size: 0; + margin-top: 10px; + margin-bottom: 10px; } -.btn-toolbar .btn-group { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; +.btn-toolbar > .btn + .btn, +.btn-toolbar > .btn-group + .btn, +.btn-toolbar > .btn + .btn-group { + margin-left: 5px; } .btn-group > .btn { position: relative; - float: left; - margin-left: -1px; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } +.btn-group > .btn + .btn { + margin-left: -1px; +} +.btn-group > .btn, +.btn-group > .dropdown-menu, +.btn-group > .popover { + font-size: 14px; +} +.btn-group > .btn-mini { + font-size: 10.5px; +} +.btn-group > .btn-small { + font-size: 11.9px; +} +.btn-group > .btn-large { + font-size: 17.5px; +} .btn-group > .btn:first-child { margin-left: 0; -webkit-border-top-left-radius: 4px; @@ -2069,26 +2698,30 @@ input[type="submit"].btn.btn-mini { .btn-group.open .dropdown-toggle { outline: 0; } -.btn-group > .dropdown-toggle { +.btn-group > .btn + .dropdown-toggle { padding-left: 8px; padding-right: 8px; -webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); -moz-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); - *padding-top: 4px; - *padding-bottom: 4px; + *padding-top: 5px; + *padding-bottom: 5px; } -.btn-group > .btn-mini.dropdown-toggle { +.btn-group > .btn-mini + .dropdown-toggle { padding-left: 5px; padding-right: 5px; + *padding-top: 2px; + *padding-bottom: 2px; } -.btn-group > .btn-small.dropdown-toggle { - *padding-top: 4px; +.btn-group > .btn-small + .dropdown-toggle { + *padding-top: 5px; *padding-bottom: 4px; } -.btn-group > .btn-large.dropdown-toggle { +.btn-group > .btn-large + .dropdown-toggle { padding-left: 12px; padding-right: 12px; + *padding-top: 7px; + *padding-bottom: 7px; } .btn-group.open .dropdown-toggle { background-image: none; @@ -2100,7 +2733,7 @@ input[type="submit"].btn.btn-mini { background-color: #eaeaea; } .btn-group.open .btn-primary.dropdown-toggle { - background-color: #f21010; + background-color: #810606; } .btn-group.open .btn-warning.dropdown-toggle { background-color: #f89406; @@ -2118,29 +2751,23 @@ input[type="submit"].btn.btn-mini { background-color: #222222; } .btn .caret { - margin-top: 7px; + margin-top: 8px; margin-left: 0; } -.btn:hover .caret, -.open.btn-group .caret { - opacity: 1; - filter: alpha(opacity=100); -} -.btn-mini .caret { - margin-top: 5px; -} -.btn-small .caret { +.btn-large .caret { margin-top: 6px; } .btn-large .caret { - margin-top: 6px; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; } +.btn-mini .caret, +.btn-small .caret { + margin-top: 8px; +} .dropup .btn-large .caret { - border-bottom: 5px solid #000000; - border-top: 0; + border-bottom-width: 5px; } .btn-primary .caret, .btn-warning .caret, @@ -2150,45 +2777,95 @@ input[type="submit"].btn.btn-mini { .btn-inverse .caret { border-top-color: #ffffff; border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +} +.btn-group-vertical { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; +} +.btn-group-vertical > .btn { + display: block; + float: none; + max-width: 100%; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.btn-group-vertical > .btn + .btn { + margin-left: 0; + margin-top: -1px; +} +.btn-group-vertical > .btn:first-child { + -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; +} +.btn-group-vertical > .btn:last-child { + -webkit-border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; + border-radius: 0 0 4px 4px; +} +.btn-group-vertical > .btn-large:first-child { + -webkit-border-radius: 6px 6px 0 0; + -moz-border-radius: 6px 6px 0 0; + border-radius: 6px 6px 0 0; +} +.btn-group-vertical > .btn-large:last-child { + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; } .alert { padding: 8px 35px 8px 14px; - margin-bottom: 18px; + margin-bottom: 20px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); background-color: #fcf8e3; border: 1px solid #fbeed5; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; +} +.alert, +.alert h4 { color: #c09853; } -.alert-heading { - color: inherit; +.alert h4 { + margin: 0; } .alert .close { position: relative; top: -2px; right: -21px; - line-height: 18px; + line-height: 20px; } .alert-success { background-color: #dff0d8; border-color: #d6e9c6; color: #468847; } +.alert-success h4 { + color: #468847; +} .alert-danger, .alert-error { background-color: #f8f0f0; border-color: #c6898b; color: #b55457; } +.alert-danger h4, +.alert-error h4 { + color: #b55457; +} .alert-info { background-color: #d9edf7; border-color: #bce8f1; color: #3a87ad; } +.alert-info h4 { + color: #3a87ad; +} .alert-block { padding-top: 14px; padding-bottom: 14px; @@ -2202,25 +2879,29 @@ input[type="submit"].btn.btn-mini { } .nav { margin-left: 0; - margin-bottom: 18px; + margin-bottom: 20px; list-style: none; } .nav > li > a { display: block; } -.nav > li > a:hover { +.nav > li > a:hover, +.nav > li > a:focus { text-decoration: none; background-color: #eeeeee; } +.nav > li > a > img { + max-width: none; +} .nav > .pull-right { float: right; } -.nav .nav-header { +.nav-header { display: block; padding: 3px 15px; font-size: 11px; font-weight: bold; - line-height: 18px; + line-height: 20px; color: #999999; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); text-transform: uppercase; @@ -2243,18 +2924,20 @@ input[type="submit"].btn.btn-mini { padding: 3px 15px; } .nav-list > .active > a, -.nav-list > .active > a:hover { +.nav-list > .active > a:hover, +.nav-list > .active > a:focus { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #5b0404; + background-color: #810606; } -.nav-list [class^="icon-"] { +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { margin-right: 2px; } .nav-list .divider { *width: 100%; height: 1px; - margin: 8px 1px; + margin: 9px 1px; *margin: -5px 0 5px; overflow: hidden; background-color: #e5e5e5; @@ -2270,6 +2953,7 @@ input[type="submit"].btn.btn-mini { .nav-pills:after { display: table; content: ""; + line-height: 0; } .nav-tabs:after, .nav-pills:after { @@ -2295,19 +2979,21 @@ input[type="submit"].btn.btn-mini { .nav-tabs > li > a { padding-top: 8px; padding-bottom: 8px; - line-height: 18px; + line-height: 20px; border: 1px solid transparent; -webkit-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0; } -.nav-tabs > li > a:hover { +.nav-tabs > li > a:hover, +.nav-tabs > li > a:focus { border-color: #eeeeee #eeeeee #dddddd; } .nav-tabs > .active > a, -.nav-tabs > .active > a:hover { +.nav-tabs > .active > a:hover, +.nav-tabs > .active > a:focus { color: #555555; - background-color: #ffffff; + background-color: #eeeeee; border: 1px solid #ddd; border-bottom-color: transparent; cursor: default; @@ -2322,9 +3008,10 @@ input[type="submit"].btn.btn-mini { border-radius: 5px; } .nav-pills > .active > a, -.nav-pills > .active > a:hover { +.nav-pills > .active > a:hover, +.nav-pills > .active > a:focus { color: #ffffff; - background-color: #5b0404; + background-color: #810606; } .nav-stacked > li { float: none; @@ -2342,16 +3029,23 @@ input[type="submit"].btn.btn-mini { border-radius: 0; } .nav-tabs.nav-stacked > li:first-child > a { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; } .nav-tabs.nav-stacked > li:last-child > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } -.nav-tabs.nav-stacked > li > a:hover { +.nav-tabs.nav-stacked > li > a:hover, +.nav-tabs.nav-stacked > li > a:focus { border-color: #ddd; z-index: 2; } @@ -2362,51 +3056,60 @@ input[type="submit"].btn.btn-mini { margin-bottom: 1px; } .nav-tabs .dropdown-menu { - -webkit-border-radius: 0 0 5px 5px; - -moz-border-radius: 0 0 5px 5px; - border-radius: 0 0 5px 5px; + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; } .nav-pills .dropdown-menu { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } -.nav-tabs .dropdown-toggle .caret, -.nav-pills .dropdown-toggle .caret { - border-top-color: #5b0404; - border-bottom-color: #5b0404; +.nav .dropdown-toggle .caret { + border-top-color: #810606; + border-bottom-color: #810606; margin-top: 6px; } -.nav-tabs .dropdown-toggle:hover .caret, -.nav-pills .dropdown-toggle:hover .caret { - border-top-color: #120101; - border-bottom-color: #120101; +.nav .dropdown-toggle:hover .caret, +.nav .dropdown-toggle:focus .caret { + border-top-color: #380303; + border-bottom-color: #380303; } -.nav-tabs .active .dropdown-toggle .caret, -.nav-pills .active .dropdown-toggle .caret { - border-top-color: #333333; - border-bottom-color: #333333; +/* move down carets for tabs */ +.nav-tabs .dropdown-toggle .caret { + margin-top: 8px; } -.nav > .dropdown.active > a:hover { - color: #000000; +.nav .active .dropdown-toggle .caret { + border-top-color: #fff; + border-bottom-color: #fff; +} +.nav-tabs .active .dropdown-toggle .caret { + border-top-color: #555555; + border-bottom-color: #555555; +} +.nav > .dropdown.active > a:hover, +.nav > .dropdown.active > a:focus { cursor: pointer; } .nav-tabs .open .dropdown-toggle, .nav-pills .open .dropdown-toggle, -.nav > li.dropdown.open.active > a:hover { +.nav > li.dropdown.open.active > a:hover, +.nav > li.dropdown.open.active > a:focus { color: #ffffff; background-color: #999999; border-color: #999999; } .nav li.dropdown.open .caret, .nav li.dropdown.open.active .caret, -.nav li.dropdown.open a:hover .caret { +.nav li.dropdown.open a:hover .caret, +.nav li.dropdown.open a:focus .caret { border-top-color: #ffffff; border-bottom-color: #ffffff; opacity: 1; filter: alpha(opacity=100); } -.tabs-stacked .open > a:hover { +.tabs-stacked .open > a:hover, +.tabs-stacked .open > a:focus { border-color: #999999; } .tabbable { @@ -2416,6 +3119,7 @@ input[type="submit"].btn.btn-mini { .tabbable:after { display: table; content: ""; + line-height: 0; } .tabbable:after { clear: both; @@ -2448,12 +3152,14 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px; } -.tabs-below > .nav-tabs > li > a:hover { +.tabs-below > .nav-tabs > li > a:hover, +.tabs-below > .nav-tabs > li > a:focus { border-bottom-color: transparent; border-top-color: #ddd; } .tabs-below > .nav-tabs > .active > a, -.tabs-below > .nav-tabs > .active > a:hover { +.tabs-below > .nav-tabs > .active > a:hover, +.tabs-below > .nav-tabs > .active > a:focus { border-color: transparent #ddd #ddd #ddd; } .tabs-left > .nav-tabs > li, @@ -2477,11 +3183,13 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px; } -.tabs-left > .nav-tabs > li > a:hover { +.tabs-left > .nav-tabs > li > a:hover, +.tabs-left > .nav-tabs > li > a:focus { border-color: #eeeeee #dddddd #eeeeee #eeeeee; } .tabs-left > .nav-tabs .active > a, -.tabs-left > .nav-tabs .active > a:hover { +.tabs-left > .nav-tabs .active > a:hover, +.tabs-left > .nav-tabs .active > a:focus { border-color: #ddd transparent #ddd #ddd; *border-right-color: #ffffff; } @@ -2496,78 +3204,110 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; } -.tabs-right > .nav-tabs > li > a:hover { +.tabs-right > .nav-tabs > li > a:hover, +.tabs-right > .nav-tabs > li > a:focus { border-color: #eeeeee #eeeeee #eeeeee #dddddd; } .tabs-right > .nav-tabs .active > a, -.tabs-right > .nav-tabs .active > a:hover { +.tabs-right > .nav-tabs .active > a:hover, +.tabs-right > .nav-tabs .active > a:focus { border-color: #ddd #ddd #ddd transparent; *border-left-color: #ffffff; } +.nav > .disabled > a { + color: #999999; +} +.nav > .disabled > a:hover, +.nav > .disabled > a:focus { + text-decoration: none; + background-color: transparent; + cursor: default; +} .navbar { + overflow: visible; + margin-bottom: 20px; *position: relative; *z-index: 2; - overflow: visible; - margin-bottom: 18px; } .navbar-inner { min-height: 40px; padding-left: 20px; padding-right: 20px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); + background-color: #fafafa; + background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2)); + background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2); + background-image: -o-linear-gradient(top, #ffffff, #f2f2f2); + background-image: linear-gradient(to bottom, #ffffff, #f2f2f2); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); + border: 1px solid #d4d4d4; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); - -moz-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); - box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); + *zoom: 1; +} +.navbar-inner:before, +.navbar-inner:after { + display: table; + content: ""; + line-height: 0; +} +.navbar-inner:after { + clear: both; } .navbar .container { width: auto; } .nav-collapse.collapse { height: auto; -} -.navbar { - color: #999999; -} -.navbar .brand:hover { - text-decoration: none; + overflow: visible; } .navbar .brand { float: left; display: block; - padding: 8px 20px 12px; + padding: 10px 20px 10px; margin-left: -20px; font-size: 20px; font-weight: 200; - line-height: 1; - color: #999999; + color: #777777; + text-shadow: 0 1px 0 #ffffff; +} +.navbar .brand:hover, +.navbar .brand:focus { + text-decoration: none; } -.navbar .navbar-text { +.navbar-text { margin-bottom: 0; line-height: 40px; + color: #777777; } -.navbar .navbar-link { - color: #999999; +.navbar-link { + color: #777777; } -.navbar .navbar-link:hover { - color: #ffffff; +.navbar-link:hover, +.navbar-link:focus { + color: #333333; +} +.navbar .divider-vertical { + height: 40px; + margin: 0 9px; + border-left: 1px solid #f2f2f2; + border-right: 1px solid #ffffff; } .navbar .btn, .navbar .btn-group { margin-top: 5px; } -.navbar .btn-group .btn { - margin: 0; +.navbar .btn-group .btn, +.navbar .input-prepend .btn, +.navbar .input-append .btn, +.navbar .input-prepend .btn-group, +.navbar .input-append .btn-group { + margin-top: 0; } .navbar-form { margin-bottom: 0; @@ -2577,6 +3317,7 @@ input[type="submit"].btn.btn-mini { .navbar-form:after { display: table; content: ""; + line-height: 0; } .navbar-form:after { clear: both; @@ -2588,7 +3329,8 @@ input[type="submit"].btn.btn-mini { margin-top: 5px; } .navbar-form input, -.navbar-form select { +.navbar-form select, +.navbar-form .btn { display: inline-block; margin-bottom: 0; } @@ -2599,7 +3341,7 @@ input[type="submit"].btn.btn-mini { } .navbar-form .input-append, .navbar-form .input-prepend { - margin-top: 6px; + margin-top: 5px; white-space: nowrap; } .navbar-form .input-append input, @@ -2609,44 +3351,28 @@ input[type="submit"].btn.btn-mini { .navbar-search { position: relative; float: left; - margin-top: 6px; + margin-top: 5px; margin-bottom: 0; } .navbar-search .search-query { - padding: 4px 9px; + margin-bottom: 0; + padding: 4px 14px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 1; - color: #ffffff; - background-color: #626262; - border: 1px solid #151515; - -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - -webkit-transition: none; - -moz-transition: none; - -ms-transition: none; - -o-transition: none; - transition: none; -} -.navbar-search .search-query:-moz-placeholder { - color: #cccccc; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; } -.navbar-search .search-query::-webkit-input-placeholder { - color: #cccccc; +.navbar-static-top { + position: static; + margin-bottom: 0; } -.navbar-search .search-query:focus, -.navbar-search .search-query.focused { - padding: 5px 10px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - outline: 0; +.navbar-static-top .navbar-inner { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .navbar-fixed-top, .navbar-fixed-bottom { @@ -2657,6 +3383,13 @@ input[type="submit"].btn.btn-mini { margin-bottom: 0; } .navbar-fixed-top .navbar-inner, +.navbar-static-top .navbar-inner { + border-width: 0 0 1px; +} +.navbar-fixed-bottom .navbar-inner { + border-width: 1px 0 0; +} +.navbar-fixed-top .navbar-inner, .navbar-fixed-bottom .navbar-inner { padding-left: 0; padding-right: 0; @@ -2664,6 +3397,7 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0; border-radius: 0; } +.navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 940px; @@ -2671,9 +3405,20 @@ input[type="submit"].btn.btn-mini { .navbar-fixed-top { top: 0; } +.navbar-fixed-top .navbar-inner, +.navbar-static-top .navbar-inner { + -webkit-box-shadow: 0 1px 10px rgba(0,0,0,.1); + -moz-box-shadow: 0 1px 10px rgba(0,0,0,.1); + box-shadow: 0 1px 10px rgba(0,0,0,.1); +} .navbar-fixed-bottom { bottom: 0; } +.navbar-fixed-bottom .navbar-inner { + -webkit-box-shadow: 0 -1px 10px rgba(0,0,0,.1); + -moz-box-shadow: 0 -1px 10px rgba(0,0,0,.1); + box-shadow: 0 -1px 10px rgba(0,0,0,.1); +} .navbar .nav { position: relative; left: 0; @@ -2683,51 +3428,36 @@ input[type="submit"].btn.btn-mini { } .navbar .nav.pull-right { float: right; + margin-right: 0; } .navbar .nav > li { - display: block; float: left; } .navbar .nav > li > a { float: none; - padding: 9px 10px 11px; - line-height: 19px; - color: #999999; + padding: 10px 15px 10px; + color: #777777; text-decoration: none; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.navbar .btn { - display: inline-block; - padding: 4px 10px 4px; - margin: 5px 5px 6px; - line-height: 18px; + text-shadow: 0 1px 0 #ffffff; } -.navbar .btn-group { - margin: 0; - padding: 5px 5px 6px; +.navbar .nav .dropdown-toggle .caret { + margin-top: 8px; } +.navbar .nav > li > a:focus, .navbar .nav > li > a:hover { background-color: transparent; - color: #ffffff; + color: #333333; text-decoration: none; } -.navbar .nav .active > a, -.navbar .nav .active > a:hover { - color: #ffffff; +.navbar .nav > .active > a, +.navbar .nav > .active > a:hover, +.navbar .nav > .active > a:focus { + color: #555555; text-decoration: none; - background-color: #222222; -} -.navbar .divider-vertical { - height: 40px; - width: 1px; - margin: 0 9px; - overflow: hidden; - background-color: #222222; - border-right: 1px solid #333333; -} -.navbar .nav.pull-right { - margin-left: 10px; - margin-right: 0; + background-color: #e5e5e5; + -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); } .navbar .btn-navbar { display: none; @@ -2735,18 +3465,19 @@ input[type="submit"].btn.btn-mini { padding: 7px 10px; margin-left: 5px; margin-right: 5px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #ededed; + background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5)); + background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5); + background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5); + background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - border-color: #222222 #222222 #000000; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); + border-color: #e5e5e5 #e5e5e5 #bfbfbf; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #222222; + *background-color: #e5e5e5; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2755,16 +3486,18 @@ input[type="submit"].btn.btn-mini { box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); } .navbar .btn-navbar:hover, +.navbar .btn-navbar:focus, .navbar .btn-navbar:active, .navbar .btn-navbar.active, .navbar .btn-navbar.disabled, .navbar .btn-navbar[disabled] { - background-color: #222222; - *background-color: #151515; + color: #ffffff; + background-color: #e5e5e5; + *background-color: #d9d9d9; } .navbar .btn-navbar:active, .navbar .btn-navbar.active { - background-color: #080808 \9; + background-color: #cccccc \9; } .navbar .btn-navbar .icon-bar { display: block; @@ -2781,7 +3514,7 @@ input[type="submit"].btn.btn-mini { .btn-navbar .icon-bar + .icon-bar { margin-top: 3px; } -.navbar .dropdown-menu:before { +.navbar .nav > li > .dropdown-menu:before { content: ''; display: inline-block; border-left: 7px solid transparent; @@ -2792,7 +3525,7 @@ input[type="submit"].btn.btn-mini { top: -7px; left: 9px; } -.navbar .dropdown-menu:after { +.navbar .nav > li > .dropdown-menu:after { content: ''; display: inline-block; border-left: 6px solid transparent; @@ -2802,142 +3535,293 @@ input[type="submit"].btn.btn-mini { top: -6px; left: 10px; } -.navbar-fixed-bottom .dropdown-menu:before { +.navbar-fixed-bottom .nav > li > .dropdown-menu:before { border-top: 7px solid #ccc; border-top-color: rgba(0, 0, 0, 0.2); border-bottom: 0; bottom: -7px; top: auto; } -.navbar-fixed-bottom .dropdown-menu:after { +.navbar-fixed-bottom .nav > li > .dropdown-menu:after { border-top: 6px solid #ffffff; border-bottom: 0; bottom: -6px; top: auto; } -.navbar .nav li.dropdown .dropdown-toggle .caret, -.navbar .nav li.dropdown.open .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} -.navbar .nav li.dropdown.active .caret { - opacity: 1; - filter: alpha(opacity=100); +.navbar .nav li.dropdown > a:hover .caret, +.navbar .nav li.dropdown > a:focus .caret { + border-top-color: #333333; + border-bottom-color: #333333; } .navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.open.active > .dropdown-toggle { - background-color: transparent; + background-color: #e5e5e5; + color: #555555; } -.navbar .nav li.dropdown.active > .dropdown-toggle:hover { - color: #ffffff; +.navbar .nav li.dropdown > .dropdown-toggle .caret { + border-top-color: #777777; + border-bottom-color: #777777; +} +.navbar .nav li.dropdown.open > .dropdown-toggle .caret, +.navbar .nav li.dropdown.active > .dropdown-toggle .caret, +.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret { + border-top-color: #555555; + border-bottom-color: #555555; } -.navbar .pull-right .dropdown-menu, -.navbar .dropdown-menu.pull-right { +.navbar .pull-right > li > .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right { left: auto; right: 0; } -.navbar .pull-right .dropdown-menu:before, -.navbar .dropdown-menu.pull-right:before { +.navbar .pull-right > li > .dropdown-menu:before, +.navbar .nav > li > .dropdown-menu.pull-right:before { left: auto; right: 12px; } -.navbar .pull-right .dropdown-menu:after, -.navbar .dropdown-menu.pull-right:after { +.navbar .pull-right > li > .dropdown-menu:after, +.navbar .nav > li > .dropdown-menu.pull-right:after { left: auto; right: 13px; } -.breadcrumb { - padding: 7px 14px; - margin: 0 0 18px; - list-style: none; - background-color: #fbfbfb; - background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5)); - background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); - background-image: linear-gradient(top, #ffffff, #f5f5f5); +.navbar .pull-right > li > .dropdown-menu .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu { + left: auto; + right: 100%; + margin-left: 0; + margin-right: -1px; + -webkit-border-radius: 6px 0 6px 6px; + -moz-border-radius: 6px 0 6px 6px; + border-radius: 6px 0 6px 6px; +} +.navbar-inverse .navbar-inner { + background-color: #1b1b1b; + background-image: -moz-linear-gradient(top, #222222, #111111); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111)); + background-image: -webkit-linear-gradient(top, #222222, #111111); + background-image: -o-linear-gradient(top, #222222, #111111); + background-image: linear-gradient(to bottom, #222222, #111111); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); - border: 1px solid #ddd; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0); + border-color: #252525; } -.breadcrumb li { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - text-shadow: 0 1px 0 #ffffff; +.navbar-inverse .brand, +.navbar-inverse .nav > li > a { + color: #999999; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } -.breadcrumb .divider { - padding: 0 5px; +.navbar-inverse .brand:hover, +.navbar-inverse .nav > li > a:hover, +.navbar-inverse .brand:focus, +.navbar-inverse .nav > li > a:focus { + color: #ffffff; +} +.navbar-inverse .brand { color: #999999; } -.breadcrumb .active a { - color: #333333; +.navbar-inverse .navbar-text { + color: #999999; } -.pagination { - height: 36px; - margin: 18px 0; +.navbar-inverse .nav > li > a:focus, +.navbar-inverse .nav > li > a:hover { + background-color: transparent; + color: #ffffff; } -.pagination ul { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - margin-left: 0; - margin-bottom: 0; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; +.navbar-inverse .nav .active > a, +.navbar-inverse .nav .active > a:hover, +.navbar-inverse .nav .active > a:focus { + color: #ffffff; + background-color: #111111; +} +.navbar-inverse .navbar-link { + color: #999999; +} +.navbar-inverse .navbar-link:hover, +.navbar-inverse .navbar-link:focus { + color: #ffffff; +} +.navbar-inverse .divider-vertical { + border-left-color: #111111; + border-right-color: #222222; +} +.navbar-inverse .nav li.dropdown.open > .dropdown-toggle, +.navbar-inverse .nav li.dropdown.active > .dropdown-toggle, +.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle { + background-color: #111111; + color: #ffffff; +} +.navbar-inverse .nav li.dropdown > a:hover .caret, +.navbar-inverse .nav li.dropdown > a:focus .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; +} +.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret { + border-top-color: #999999; + border-bottom-color: #999999; +} +.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, +.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret, +.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; +} +.navbar-inverse .navbar-search .search-query { + color: #ffffff; + background-color: #515151; + border-color: #111111; + -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + -webkit-transition: none; + -moz-transition: none; + -o-transition: none; + transition: none; +} +.navbar-inverse .navbar-search .search-query:-moz-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query:-ms-input-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query:focus, +.navbar-inverse .navbar-search .search-query.focused { + padding: 5px 15px; + color: #333333; + text-shadow: 0 1px 0 #ffffff; + background-color: #ffffff; + border: 0; + -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + outline: 0; +} +.navbar-inverse .btn-navbar { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #0e0e0e; + background-image: -moz-linear-gradient(top, #151515, #040404); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404)); + background-image: -webkit-linear-gradient(top, #151515, #040404); + background-image: -o-linear-gradient(top, #151515, #040404); + background-image: linear-gradient(to bottom, #151515, #040404); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0); + border-color: #040404 #040404 #000000; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + *background-color: #040404; + /* Darken IE7 buttons by default so they stand out more given they won't have borders */ + + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +} +.navbar-inverse .btn-navbar:hover, +.navbar-inverse .btn-navbar:focus, +.navbar-inverse .btn-navbar:active, +.navbar-inverse .btn-navbar.active, +.navbar-inverse .btn-navbar.disabled, +.navbar-inverse .btn-navbar[disabled] { + color: #ffffff; + background-color: #040404; + *background-color: #000000; +} +.navbar-inverse .btn-navbar:active, +.navbar-inverse .btn-navbar.active { + background-color: #000000 \9; +} +.breadcrumb { + padding: 8px 15px; + margin: 0 0 20px; + list-style: none; + background-color: #f5f5f5; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.breadcrumb > li { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + text-shadow: 0 1px 0 #ffffff; +} +.breadcrumb > li > .divider { + padding: 0 5px; + color: #ccc; +} +.breadcrumb > .active { + color: #999999; +} +.pagination { + margin: 20px 0; +} +.pagination ul { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + margin-left: 0; + margin-bottom: 0; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); } -.pagination li { +.pagination ul > li { display: inline; } -.pagination a { +.pagination ul > li > a, +.pagination ul > li > span { float: left; - padding: 0 14px; - line-height: 34px; + padding: 4px 12px; + line-height: 20px; text-decoration: none; - border: 1px solid #ddd; + background-color: #ffffff; + border: 1px solid #dddddd; border-left-width: 0; } -.pagination a:hover, -.pagination .active a { +.pagination ul > li > a:hover, +.pagination ul > li > a:focus, +.pagination ul > .active > a, +.pagination ul > .active > span { background-color: #f5f5f5; } -.pagination .active a { +.pagination ul > .active > a, +.pagination ul > .active > span { color: #999999; cursor: default; } -.pagination .disabled span, -.pagination .disabled a, -.pagination .disabled a:hover { +.pagination ul > .disabled > span, +.pagination ul > .disabled > a, +.pagination ul > .disabled > a:hover, +.pagination ul > .disabled > a:focus { color: #999999; background-color: transparent; cursor: default; } -.pagination li:first-child a { +.pagination ul > li:first-child > a, +.pagination ul > li:first-child > span { border-left-width: 1px; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } -.pagination li:last-child a { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; +.pagination ul > li:last-child > a, +.pagination ul > li:last-child > span { + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; } .pagination-centered { text-align: center; @@ -2945,9 +3829,63 @@ input[type="submit"].btn.btn-mini { .pagination-right { text-align: right; } +.pagination-large ul > li > a, +.pagination-large ul > li > span { + padding: 11px 19px; + font-size: 17.5px; +} +.pagination-large ul > li:first-child > a, +.pagination-large ul > li:first-child > span { + -webkit-border-top-left-radius: 6px; + -moz-border-radius-topleft: 6px; + border-top-left-radius: 6px; + -webkit-border-bottom-left-radius: 6px; + -moz-border-radius-bottomleft: 6px; + border-bottom-left-radius: 6px; +} +.pagination-large ul > li:last-child > a, +.pagination-large ul > li:last-child > span { + -webkit-border-top-right-radius: 6px; + -moz-border-radius-topright: 6px; + border-top-right-radius: 6px; + -webkit-border-bottom-right-radius: 6px; + -moz-border-radius-bottomright: 6px; + border-bottom-right-radius: 6px; +} +.pagination-mini ul > li:first-child > a, +.pagination-small ul > li:first-child > a, +.pagination-mini ul > li:first-child > span, +.pagination-small ul > li:first-child > span { + -webkit-border-top-left-radius: 3px; + -moz-border-radius-topleft: 3px; + border-top-left-radius: 3px; + -webkit-border-bottom-left-radius: 3px; + -moz-border-radius-bottomleft: 3px; + border-bottom-left-radius: 3px; +} +.pagination-mini ul > li:last-child > a, +.pagination-small ul > li:last-child > a, +.pagination-mini ul > li:last-child > span, +.pagination-small ul > li:last-child > span { + -webkit-border-top-right-radius: 3px; + -moz-border-radius-topright: 3px; + border-top-right-radius: 3px; + -webkit-border-bottom-right-radius: 3px; + -moz-border-radius-bottomright: 3px; + border-bottom-right-radius: 3px; +} +.pagination-small ul > li > a, +.pagination-small ul > li > span { + padding: 2px 10px; + font-size: 11.9px; +} +.pagination-mini ul > li > a, +.pagination-mini ul > li > span { + padding: 0 6px; + font-size: 10.5px; +} .pager { - margin-left: 0; - margin-bottom: 18px; + margin: 20px 0; list-style: none; text-align: center; *zoom: 1; @@ -2956,6 +3894,7 @@ input[type="submit"].btn.btn-mini { .pager:after { display: table; content: ""; + line-height: 0; } .pager:after { clear: both; @@ -2963,7 +3902,8 @@ input[type="submit"].btn.btn-mini { .pager li { display: inline; } -.pager a { +.pager li > a, +.pager li > span { display: inline-block; padding: 5px 14px; background-color: #fff; @@ -2972,34 +3912,27 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 15px; border-radius: 15px; } -.pager a:hover { +.pager li > a:hover, +.pager li > a:focus { text-decoration: none; background-color: #f5f5f5; } -.pager .next a { +.pager .next > a, +.pager .next > span { float: right; } -.pager .previous a { +.pager .previous > a, +.pager .previous > span { float: left; } -.pager .disabled a, -.pager .disabled a:hover { +.pager .disabled > a, +.pager .disabled > a:hover, +.pager .disabled > a:focus, +.pager .disabled > span { color: #999999; background-color: #fff; cursor: default; } -.modal-open .dropdown-menu { - z-index: 2050; -} -.modal-open .dropdown.open { - *z-index: 2050; -} -.modal-open .popover { - z-index: 2060; -} -.modal-open .tooltip { - z-index: 2070; -} .modal-backdrop { position: fixed; top: 0; @@ -3019,12 +3952,11 @@ input[type="submit"].btn.btn-mini { } .modal { position: fixed; - top: 50%; + top: 10%; left: 50%; z-index: 1050; - overflow: auto; width: 560px; - margin: -250px 0 0 -280px; + margin-left: -280px; background-color: #ffffff; border: 1px solid #999; border: 1px solid rgba(0, 0, 0, 0.3); @@ -3040,17 +3972,17 @@ input[type="submit"].btn.btn-mini { -webkit-background-clip: padding-box; -moz-background-clip: padding-box; background-clip: padding-box; + outline: none; } .modal.fade { -webkit-transition: opacity .3s linear, top .3s ease-out; -moz-transition: opacity .3s linear, top .3s ease-out; - -ms-transition: opacity .3s linear, top .3s ease-out; -o-transition: opacity .3s linear, top .3s ease-out; transition: opacity .3s linear, top .3s ease-out; top: -25%; } .modal.fade.in { - top: 50%; + top: 10%; } .modal-header { padding: 9px 15px; @@ -3059,7 +3991,12 @@ input[type="submit"].btn.btn-mini { .modal-header .close { margin-top: 2px; } +.modal-header h3 { + margin: 0; + line-height: 30px; +} .modal-body { + position: relative; overflow-y: auto; max-height: 400px; padding: 15px; @@ -3085,6 +4022,7 @@ input[type="submit"].btn.btn-mini { .modal-footer:after { display: table; content: ""; + line-height: 0; } .modal-footer:after { clear: both; @@ -3096,13 +4034,16 @@ input[type="submit"].btn.btn-mini { .modal-footer .btn-group .btn + .btn { margin-left: -1px; } +.modal-footer .btn-block + .btn-block { + margin-left: 0; +} .tooltip { position: absolute; - z-index: 1020; + z-index: 1030; display: block; visibility: visible; - padding: 5px; font-size: 11px; + line-height: 1.4; opacity: 0; filter: alpha(opacity=0); } @@ -3111,52 +4052,24 @@ input[type="submit"].btn.btn-mini { filter: alpha(opacity=80); } .tooltip.top { - margin-top: -2px; + margin-top: -3px; + padding: 5px 0; } .tooltip.right { - margin-left: 2px; + margin-left: 3px; + padding: 0 5px; } .tooltip.bottom { - margin-top: 2px; + margin-top: 3px; + padding: 5px 0; } .tooltip.left { - margin-left: -2px; -} -.tooltip.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; -} -.tooltip.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.tooltip.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; -} -.tooltip.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; + margin-left: -3px; + padding: 0 5px; } .tooltip-inner { max-width: 200px; - padding: 3px 8px; + padding: 8px; color: #ffffff; text-align: center; text-decoration: none; @@ -3169,100 +4082,36 @@ input[type="submit"].btn.btn-mini { position: absolute; width: 0; height: 0; + border-color: transparent; + border-style: solid; } -.popover { - position: absolute; - top: 0; - left: 0; - z-index: 1010; - display: none; - padding: 5px; -} -.popover.top { - margin-top: -5px; -} -.popover.right { - margin-left: 5px; -} -.popover.bottom { - margin-top: 5px; -} -.popover.left { - margin-left: -5px; -} -.popover.top .arrow { +.tooltip.top .tooltip-arrow { bottom: 0; left: 50%; margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; + border-width: 5px 5px 0; + border-top-color: #000000; } -.popover.right .arrow { +.tooltip.right .tooltip-arrow { top: 50%; left: 0; margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; -} -.popover.bottom .arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; + border-width: 5px 5px 5px 0; + border-right-color: #000000; } -.popover.left .arrow { +.tooltip.left .tooltip-arrow { top: 50%; right: 0; margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.popover .arrow { - position: absolute; - width: 0; - height: 0; -} -.popover-inner { - padding: 3px; - width: 280px; - overflow: hidden; - background: #000000; - background: rgba(0, 0, 0, 0.8); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -} -.popover-title { - padding: 9px 15px; - line-height: 1; - background-color: #f5f5f5; - border-bottom: 1px solid #eee; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; + border-width: 5px 0 5px 5px; + border-left-color: #000000; } -.popover-content { - padding: 14px; - background-color: #ffffff; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} -.popover-content p, -.popover-content ul, -.popover-content ol { - margin-bottom: 0; +.tooltip.bottom .tooltip-arrow { + top: 0; + left: 50%; + margin-left: -5px; + border-width: 0 5px 5px; + border-bottom-color: #000000; } .thumbnails { margin-left: -20px; @@ -3273,6 +4122,7 @@ input[type="submit"].btn.btn-mini { .thumbnails:after { display: table; content: ""; + line-height: 0; } .thumbnails:after { clear: both; @@ -3282,23 +4132,28 @@ input[type="submit"].btn.btn-mini { } .thumbnails > li { float: left; - margin-bottom: 18px; + margin-bottom: 20px; margin-left: 20px; } .thumbnail { display: block; padding: 4px; - line-height: 1; + line-height: 20px; border: 1px solid #ddd; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); -} -a.thumbnail:hover { - border-color: #5b0404; + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +a.thumbnail:hover, +a.thumbnail:focus { + border-color: #810606; -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); @@ -3311,10 +4166,13 @@ a.thumbnail:hover { } .thumbnail .caption { padding: 9px; + color: #555555; } .label, .badge { - font-size: 10.998px; + display: inline-block; + padding: 2px 4px; + font-size: 11.844px; font-weight: bold; line-height: 14px; color: #ffffff; @@ -3324,19 +4182,25 @@ a.thumbnail:hover { background-color: #999999; } .label { - padding: 1px 4px 2px; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } .badge { - padding: 1px 9px 2px; + padding-left: 9px; + padding-right: 9px; -webkit-border-radius: 9px; -moz-border-radius: 9px; border-radius: 9px; } +.label:empty, +.badge:empty { + display: none; +} a.label:hover, -a.badge:hover { +a.label:focus, +a.badge:hover, +a.badge:focus { color: #ffffff; text-decoration: none; cursor: pointer; @@ -3381,6 +4245,15 @@ a.badge:hover { .badge-inverse[href] { background-color: #1a1a1a; } +.btn .label, +.btn .badge { + position: relative; + top: -1px; +} +.btn-mini .label, +.btn-mini .badge { + top: 0; +} @-webkit-keyframes progress-bar-stripes { from { background-position: 40px 0; @@ -3423,17 +4296,16 @@ a.badge:hover { } .progress { overflow: hidden; - height: 18px; - margin-bottom: 18px; + height: 20px; + margin-bottom: 20px; background-color: #f7f7f7; background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0); -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); @@ -3443,41 +4315,43 @@ a.badge:hover { } .progress .bar { width: 0%; - height: 18px; + height: 100%; color: #ffffff; + float: left; font-size: 12px; text-align: center; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #0e90d2; background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -ms-linear-gradient(top, #149bdf, #0480be); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); background-image: -webkit-linear-gradient(top, #149bdf, #0480be); background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(top, #149bdf, #0480be); + background-image: linear-gradient(to bottom, #149bdf, #0480be); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; -webkit-transition: width 0.6s ease; -moz-transition: width 0.6s ease; - -ms-transition: width 0.6s ease; -o-transition: width 0.6s ease; transition: width 0.6s ease; } +.progress .bar + .bar { + -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); + -moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); + box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); +} .progress-striped .bar { background-color: #149bdf; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -webkit-background-size: 40px 40px; -moz-background-size: 40px 40px; -o-background-size: 40px 40px; @@ -3490,88 +4364,88 @@ a.badge:hover { -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; } -.progress-danger .bar { +.progress-danger .bar, +.progress .bar-danger { background-color: #dd514c; background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(top, #ee5f5b, #c43c35); + background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0); } -.progress-danger.progress-striped .bar { +.progress-danger.progress-striped .bar, +.progress-striped .bar-danger { background-color: #ee5f5b; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-success .bar { +.progress-success .bar, +.progress .bar-success { background-color: #5eb95e; background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); background-image: -webkit-linear-gradient(top, #62c462, #57a957); background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); + background-image: linear-gradient(to bottom, #62c462, #57a957); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0); } -.progress-success.progress-striped .bar { +.progress-success.progress-striped .bar, +.progress-striped .bar-success { background-color: #62c462; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-info .bar { +.progress-info .bar, +.progress .bar-info { background-color: #4bb1cf; background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(top, #5bc0de, #339bb9); + background-image: linear-gradient(to bottom, #5bc0de, #339bb9); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0); } -.progress-info.progress-striped .bar { +.progress-info.progress-striped .bar, +.progress-striped .bar-info { background-color: #5bc0de; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-warning .bar { +.progress-warning .bar, +.progress .bar-warning { background-color: #faa732; background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-linear-gradient(top, #fbb450, #f89406); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); background-image: -webkit-linear-gradient(top, #fbb450, #f89406); background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(top, #fbb450, #f89406); + background-image: linear-gradient(to bottom, #fbb450, #f89406); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); } -.progress-warning.progress-striped .bar { +.progress-warning.progress-striped .bar, +.progress-striped .bar-warning { background-color: #fbb450; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .accordion { - margin-bottom: 18px; + margin-bottom: 20px; } .accordion-group { margin-bottom: 2px; @@ -3596,7 +4470,7 @@ a.badge:hover { } .carousel { position: relative; - margin-bottom: 18px; + margin-bottom: 20px; line-height: 1; } .carousel-inner { @@ -3604,47 +4478,47 @@ a.badge:hover { width: 100%; position: relative; } -.carousel .item { +.carousel-inner > .item { display: none; position: relative; -webkit-transition: 0.6s ease-in-out left; -moz-transition: 0.6s ease-in-out left; - -ms-transition: 0.6s ease-in-out left; -o-transition: 0.6s ease-in-out left; transition: 0.6s ease-in-out left; } -.carousel .item > img { +.carousel-inner > .item > img, +.carousel-inner > .item > a > img { display: block; line-height: 1; } -.carousel .active, -.carousel .next, -.carousel .prev { +.carousel-inner > .active, +.carousel-inner > .next, +.carousel-inner > .prev { display: block; } -.carousel .active { +.carousel-inner > .active { left: 0; } -.carousel .next, -.carousel .prev { +.carousel-inner > .next, +.carousel-inner > .prev { position: absolute; top: 0; width: 100%; } -.carousel .next { +.carousel-inner > .next { left: 100%; } -.carousel .prev { +.carousel-inner > .prev { left: -100%; } -.carousel .next.left, -.carousel .prev.right { +.carousel-inner > .next.left, +.carousel-inner > .prev.right { left: 0; } -.carousel .active.left { +.carousel-inner > .active.left { left: -100%; } -.carousel .active.right { +.carousel-inner > .active.right { left: 100%; } .carousel-control { @@ -3671,28 +4545,62 @@ a.badge:hover { left: auto; right: 15px; } -.carousel-control:hover { +.carousel-control:hover, +.carousel-control:focus { color: #ffffff; text-decoration: none; opacity: 0.9; filter: alpha(opacity=90); } +.carousel-indicators { + position: absolute; + top: 15px; + right: 15px; + z-index: 5; + margin: 0; + list-style: none; +} +.carousel-indicators li { + display: block; + float: left; + width: 10px; + height: 10px; + margin-left: 5px; + text-indent: -999px; + background-color: #ccc; + background-color: rgba(255, 255, 255, 0.25); + border-radius: 5px; +} +.carousel-indicators .active { + background-color: #fff; +} .carousel-caption { position: absolute; left: 0; right: 0; bottom: 0; - padding: 10px 15px 5px; + padding: 15px; background: #333333; background: rgba(0, 0, 0, 0.75); } .carousel-caption h4, .carousel-caption p { color: #ffffff; + line-height: 20px; +} +.carousel-caption h4 { + margin: 0 0 5px; +} +.carousel-caption p { + margin-bottom: 0; } .hero-unit { padding: 60px; margin-bottom: 30px; + font-size: 18px; + font-weight: 200; + line-height: 30px; + color: inherit; background-color: #eeeeee; -webkit-border-radius: 6px; -moz-border-radius: 6px; @@ -3705,1279 +4613,2219 @@ a.badge:hover { color: inherit; letter-spacing: -1px; } -.hero-unit p { - font-size: 18px; - font-weight: 200; - line-height: 27px; - color: inherit; -} -.pull-right { - float: right; -} -.pull-left { - float: left; +.hero-unit li { + line-height: 30px; } -.hide { +.popover { + position: absolute; + top: 0; + left: 0; + z-index: 1010; display: none; + max-width: 276px; + padding: 1px; + text-align: left; + background-color: #ffffff; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + white-space: normal; } -.show { - display: block; +.popover.top { + margin-top: -10px; } -.invisible { - visibility: hidden; +.popover.right { + margin-left: 10px; } -/* Font Awesome - the iconic font designed for use with Twitter Bootstrap - ------------------------------------------------------- - The full suite of pictographic icons, examples, and documentation - can be found at: http://fortawesome.github.com/Font-Awesome/ - - License - ------------------------------------------------------- - The Font Awesome webfont, CSS, and LESS files are licensed under CC BY 3.0: - http://creativecommons.org/licenses/by/3.0/ A mention of - 'Font Awesome - http://fortawesome.github.com/Font-Awesome' in human-readable - source code is considered acceptable attribution (most common on the web). - If human readable source code is not available to the end user, a mention in - an 'About' or 'Credits' screen is considered acceptable (most common in desktop - or mobile software). - - Contact - ------------------------------------------------------- - Email: dave@davegandy.com - Twitter: http://twitter.com/fortaweso_me - Work: Lead Product Designer @ http://kyruus.com - - */ -@font-face { - font-family: 'FontAwesome'; - src: url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.eot'); - src: url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.woff') format('woff'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.ttf') format('truetype'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.svg#FontAwesome') format('svg'); - font-weight: normal; - font-style: normal; +.popover.bottom { + margin-top: 10px; } -/* Font Awesome styles - ------------------------------------------------------- */ -[class^="icon-"]:before, -[class*=" icon-"]:before { - font-family: FontAwesome; +.popover.left { + margin-left: -10px; +} +.popover-title { + margin: 0; + padding: 8px 14px; + font-size: 14px; font-weight: normal; - font-style: normal; - display: inline-block; - text-decoration: inherit; + line-height: 18px; + background-color: #f7f7f7; + border-bottom: 1px solid #ebebeb; + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; } -a [class^="icon-"], -a [class*=" icon-"] { - display: inline-block; - text-decoration: inherit; +.popover-title:empty { + display: none; } -/* makes the font 33% larger relative to the icon container */ -.icon-large:before { - vertical-align: middle; - font-size: 1.3333333333333333em; +.popover-content { + padding: 9px 14px; } -.btn [class^="icon-"], -.nav-tabs [class^="icon-"], -.btn [class*=" icon-"], -.nav-tabs [class*=" icon-"] { - /* keeps button heights with and without icons the same */ - - line-height: .9em; +.popover .arrow, +.popover .arrow:after { + position: absolute; + display: block; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; } -li [class^="icon-"], -li [class*=" icon-"] { - display: inline-block; - width: 1.25em; - text-align: center; +.popover .arrow { + border-width: 11px; } -li .icon-large:before, -li .icon-large:before { - /* 1.5 increased font size for icon-large * 1.25 width */ - - width: 1.875em; +.popover .arrow:after { + border-width: 10px; + content: ""; } -ul.icons { - list-style-type: none; - margin-left: 2em; - text-indent: -0.8em; +.popover.top .arrow { + left: 50%; + margin-left: -11px; + border-bottom-width: 0; + border-top-color: #999; + border-top-color: rgba(0, 0, 0, 0.25); + bottom: -11px; +} +.popover.top .arrow:after { + bottom: 1px; + margin-left: -10px; + border-bottom-width: 0; + border-top-color: #ffffff; } -ul.icons li [class^="icon-"], -ul.icons li [class*=" icon-"] { - width: .8em; +.popover.right .arrow { + top: 50%; + left: -11px; + margin-top: -11px; + border-left-width: 0; + border-right-color: #999; + border-right-color: rgba(0, 0, 0, 0.25); } -ul.icons li .icon-large:before, -ul.icons li .icon-large:before { - /* 1.5 increased font size for icon-large * 1.25 width */ - - vertical-align: initial; +.popover.right .arrow:after { + left: 1px; + bottom: -10px; + border-left-width: 0; + border-right-color: #ffffff; } -/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen - readers do not read off random characters that represent icons */ -.icon-glass:before { - content: "\f000"; +.popover.bottom .arrow { + left: 50%; + margin-left: -11px; + border-top-width: 0; + border-bottom-color: #999; + border-bottom-color: rgba(0, 0, 0, 0.25); + top: -11px; } -.icon-music:before { - content: "\f001"; +.popover.bottom .arrow:after { + top: 1px; + margin-left: -10px; + border-top-width: 0; + border-bottom-color: #ffffff; } -.icon-search:before { - content: "\f002"; +.popover.left .arrow { + top: 50%; + right: -11px; + margin-top: -11px; + border-right-width: 0; + border-left-color: #999; + border-left-color: rgba(0, 0, 0, 0.25); } -.icon-envelope:before { - content: "\f003"; +.popover.left .arrow:after { + right: 1px; + border-right-width: 0; + border-left-color: #ffffff; + bottom: -10px; } -.icon-heart:before { - content: "\f004"; +.pull-right { + float: right; } -.icon-star:before { - content: "\f005"; +.pull-left { + float: left; } -.icon-star-empty:before { - content: "\f006"; +.hide { + display: none; } -.icon-user:before { - content: "\f007"; +.show { + display: block; } -.icon-film:before { - content: "\f008"; +.invisible { + visibility: hidden; } -.icon-th-large:before { - content: "\f009"; +.affix { + position: fixed; } -.icon-th:before { - content: "\f00a"; +.tag { + display: inline-block; + margin-bottom: 4px; + color: #111111; + background-color: #f6f6f6; + padding: 1px 10px; + border: 1px solid #dddddd; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; + -webkit-box-shadow: inset 0 1px 0 #ffffff; + -moz-box-shadow: inset 0 1px 0 #ffffff; + box-shadow: inset 0 1px 0 #ffffff; } -.icon-th-list:before { - content: "\f00b"; +a.tag:hover { + text-decoration: none; + color: #fff; + background-color: #b20808; + border: 1px solid #810606; + -webkit-box-shadow: inset 0 1px 0 #e20b0b; + -moz-box-shadow: inset 0 1px 0 #e20b0b; + box-shadow: inset 0 1px 0 #e20b0b; } -.icon-ok:before { - content: "\f00c"; +.pill { + display: inline-block; + background-color: #6f8890; + color: #ffffff; + padding: 2px 10px 1px 10px; + margin-right: 5px; + font-weight: normal; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; } -.icon-remove:before { - content: "\f00d"; +.pill a { + color: #ffffff; } -.icon-zoom-in:before { - content: "\f00e"; +.pill a.remove { + font-size: 11px; } -.icon-zoom-out:before { - content: "\f010"; +.unstyled { + margin: 0; + list-style: none; } -.icon-off:before { - content: "\f011"; +.simple-item { + font-size: 12px; + line-height: 1.1666666666666667em; + padding: 7px 25px; + border-bottom: 1px dotted #dddddd; } -.icon-signal:before { - content: "\f012"; +.simple-item:last-of-type { + border-bottom: 0; } -.icon-cog:before { - content: "\f013"; +.simple-list { + *zoom: 1; + margin: 0; + list-style: none; } -.icon-trash:before { - content: "\f014"; +.simple-list:before, +.simple-list:after { + display: table; + content: ""; + line-height: 0; } -.icon-home:before { - content: "\f015"; +.simple-list:after { + clear: both; } -.icon-file:before { - content: "\f016"; +.simple-list > li { + font-size: 12px; + line-height: 1.1666666666666667em; + padding: 7px 25px; + border-bottom: 1px dotted #dddddd; } -.icon-time:before { - content: "\f017"; +.simple-list > li:last-of-type { + border-bottom: 0; } -.icon-road:before { - content: "\f018"; +.simple-list .ckan-icon { + position: relative; + top: 0px; } -.icon-download-alt:before { - content: "\f019"; +.module-narrow .simple-list > li { + padding-left: 15px; + padding-right: 15px; + position: relative; } -.icon-download:before { - content: "\f01a"; +.listing li { + text-align: right; + margin-bottom: 5px; } -.icon-upload:before { - content: "\f01b"; +.listing .key { + clear: right; + font-weight: bold; } -.icon-inbox:before { - content: "\f01c"; +.js .tab-content { + display: none; } -.icon-play-circle:before { - content: "\f01d"; +.js .tab-content.active { + display: block; } -.icon-repeat:before { - content: "\f01e"; +.box { + background-color: #FFF; + border: 1px solid #cccccc; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); } -/* \f020 doesn't work in Safari. all shifted one down */ -.icon-refresh:before { - content: "\f021"; +.module { + margin: 20px 0; } -.icon-list-alt:before { - content: "\f022"; +.module-heading { + *zoom: 1; + margin: 0; + padding: 7px 25px; + font-size: 14px; + line-height: 1.3; + background-color: #f6f6f6; + border-top: 1px solid #dddddd; + border-bottom: 1px solid #dddddd; } -.icon-lock:before { - content: "\f023"; +.module-heading:before, +.module-heading:after { + display: table; + content: ""; + line-height: 0; } -.icon-flag:before { - content: "\f024"; +.module-heading:after { + clear: both; } -.icon-headphones:before { - content: "\f025"; +.module-heading .action { + float: right; + color: #888888; + font-size: 12px; + line-height: 20px; + text-decoration: underline; } -.icon-volume-off:before { - content: "\f026"; +.module-heading .action:hover { + color: #444444; } -.icon-volume-down:before { - content: "\f027"; +.module-content { + padding: 0 25px; + margin: 20px 0; } -.icon-volume-up:before { - content: "\f028"; +.module-content:first-child { + margin-top: 0; + padding-top: 20px; } -.icon-qrcode:before { - content: "\f029"; +.module-content:last-child { + margin-bottom: 0; + padding-bottom: 20px; } -.icon-barcode:before { - content: "\f02a"; +.module-content > :last-child { + margin-bottom: 0; } -.icon-tag:before { - content: "\f02b"; +.module:first-child .module-heading { + -webkit-border-radius: 3px 0 0 0; + -moz-border-radius: 3px 0 0 0; + border-radius: 3px 0 0 0; + border-top-width: 0; } -.icon-tags:before { - content: "\f02c"; +.module:last-child { + margin-bottom: 20px; } -.icon-book:before { - content: "\f02d"; +.module-footer { + padding: 7px 25px 7px; + margin: 0; + border-top: 1px dotted #dddddd; } -.icon-bookmark:before { - content: "\f02e"; +.module .read-more { + font-weight: bold; + color: #000000; } -.icon-print:before { - content: "\f02f"; +.module .pagination { + height: 34px; + margin-bottom: 0; + border-top: 1px solid #dddddd; } -.icon-camera:before { - content: "\f030"; +.module-content .pagination { + margin-left: -25px; + margin-right: -25px; + margin-bottom: -20px; } -.icon-font:before { - content: "\f031"; +.module .pagination > ul { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + border: 0; } -.icon-bold:before { - content: "\f032"; +.module .pagination li a { + border-top: none; + border-bottom: none; + padding-top: 7px; + padding-bottom: 7px; } -.icon-italic:before { - content: "\f033"; +.module .pagination li:first-child a, +.module .pagination li:last-child a { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } -.icon-text-height:before { - content: "\f034"; +.module .pagination li:first-child a { + border-left-width: 0; } -.icon-text-width:before { - content: "\f035"; +.module .pagination li:last-child a { + border-right-width: 0; } -.icon-align-left:before { - content: "\f036"; +.module .pagination li.active a { + border-left-width: 1px; + border-right-width: 1px; } -.icon-align-center:before { - content: "\f037"; +.module-content-shallow { + padding: 0; + margin-top: 10px; + padding-bottom: 10px; } -.icon-align-right:before { - content: "\f038"; +.module h1 { + margin-bottom: 20px; } -.icon-align-justify:before { - content: "\f039"; +.module-shallow .module-content { + padding: 10px; + margin: 0; } -.icon-list:before { - content: "\f03a"; +.module-shallow .module-tags { + margin-top: 0; + margin-bottom: 0; } -.icon-indent-left:before { - content: "\f03b"; +.module-shallow .module-content:first-child { + padding-top: 10px; } -.icon-indent-right:before { - content: "\f03c"; +.module-shallow .module-content:last-child { + padding-bottom: 10px; } -.icon-facetime-video:before { - content: "\f03d"; +.module-narrow .module-heading, +.module-narrow .module-content, +.module-narrow .module-footer { + padding-left: 15px; + padding-right: 15px; } -.icon-picture:before { - content: "\f03e"; +.module-grid { + margin: 0; + list-style: none; + *zoom: 1; + margin: 0 -25px; + padding-bottom: 15px; + background: #fbfbfb url("../../../base/images/bg.png"); + border: 1px solid #dddddd; + border-width: 1px 0; } -.icon-pencil:before { - content: "\f040"; +.module-grid:before, +.module-grid:after { + display: table; + content: ""; + line-height: 0; } -.icon-map-marker:before { - content: "\f041"; +.module-grid:after { + clear: both; } -.icon-adjust:before { - content: "\f042"; +.module-item { + width: 189px; + padding: 15px; + margin: 15px 0 0 15px; + background-color: white; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + float: left; + margin-left: 20px; + width: 460px; + padding-top: 10px; + padding-bottom: 10px; + padding-right: 50px; + overflow: hidden; + position: relative; } -.icon-tint:before { - content: "\f043"; +.module-item span.count { + color: #999; } -.icon-edit:before { - content: "\f044"; +.module-item .media-image { + margin-bottom: 5px; } -.icon-share:before { - content: "\f045"; +.module-item .media-edit { + opacity: 0; + position: absolute; + right: 15px; + bottom: 15px; + -webkit-transition: opacity 0.2s ease-in; + -moz-transition: opacity 0.2s ease-in; + -o-transition: opacity 0.2s ease-in; + transition: opacity 0.2s ease-in; } -.icon-check:before { - content: "\f046"; +.module-item:hover { + z-index: 1; } -.icon-move:before { - content: "\f047"; +.module-item:hover .media-edit { + opacity: 1; } -.icon-step-backward:before { - content: "\f048"; +.module-item.first { + clear: left; } -.icon-fast-backward:before { - content: "\f049"; +.group .content img { + margin: 0 -5px 5px; + max-width: initial; } -.icon-backward:before { - content: "\f04a"; +.group .content h3 { + font-size: 14px; + line-height: 1.3; } -.icon-play:before { - content: "\f04b"; +.group-listing { + margin-left: -20px; } -.icon-pause:before { - content: "\f04c"; +.ckanext-datapreview { + position: relative; } -.icon-stop:before { - content: "\f04d"; +.ckanext-datapreview > iframe { + min-height: 400px; } -.icon-forward:before { - content: "\f04e"; +.ckanext-datapreview > img { + max-height: 500px; + max-width: 100%; + overflow: hidden; } -.icon-fast-forward:before { - content: "\f050"; +.package-info h4 { + margin-bottom: 10px; } -.icon-step-forward:before { - content: "\f051"; +.module-resource { + background-color: #ffffff; + border-bottom: 1px solid #dddddd; + margin-top: 0; + margin-bottom: 0; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } -.icon-eject:before { - content: "\f052"; +.module-resource .actions { + position: relative; + float: right; + top: -10px; + right: -15px; } -.icon-chevron-left:before { - content: "\f053"; +.module .module-tags { + padding-bottom: 8px; } -.icon-chevron-right:before { - content: "\f054"; +.secondary .module:first-child, +.primary .module:first-child { + margin-top: 0; } -.icon-plus-sign:before { - content: "\f055"; +.no-nav .module:last-child { + margin-top: 0; } -.icon-minus-sign:before { - content: "\f056"; -} -.icon-remove-sign:before { - content: "\f057"; +.module-image { + float: left; + width: 50px; + height: 50px; + line-height: 50px; + text-align: center; + margin-right: 15px; } -.icon-ok-sign:before { - content: "\f058"; +.module-image img { + max-width: 50px; + max-height: 50px; + vertical-align: middle; } -.icon-question-sign:before { - content: "\f059"; +.banner { + -webkit-transform: rotate(45deg); + -moz-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); + -webkit-transform-origin: center center; + -moz-transform-origin: center center; + -ms-transform-origin: center center; + -o-transform-origin: center center; + transform-origin: center center; + position: absolute; + top: 15px; + right: -35px; + width: 80px; + color: #ffffff; + background-color: #810606; + padding: 1px 20px; + font-size: 11px; + text-align: center; + text-transform: uppercase; } -.icon-info-sign:before { - content: "\f05a"; +.media-grid { + margin: 0; + list-style: none; + *zoom: 1; + margin: 0 -25px; + padding-bottom: 15px; + background: #fbfbfb url("../../../base/images/bg.png"); + border: 1px solid #dddddd; + border-width: 1px 0; } -.icon-screenshot:before { - content: "\f05b"; +.media-grid:before, +.media-grid:after { + display: table; + content: ""; + line-height: 0; } -.icon-remove-circle:before { - content: "\f05c"; +.media-grid:after { + clear: both; } -.icon-ok-circle:before { - content: "\f05d"; +.media-item { + position: relative; + float: left; + width: 189px; + padding: 15px; + margin: 15px 0 0 15px; + background-color: white; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.icon-ban-circle:before { - content: "\f05e"; +.media-item span.count { + color: #999; } -.icon-arrow-left:before { - content: "\f060"; +.media-item .media-image { + margin-bottom: 5px; } -.icon-arrow-right:before { - content: "\f061"; +.media-item .media-edit { + opacity: 0; + position: absolute; + right: 15px; + bottom: 15px; + -webkit-transition: opacity 0.2s ease-in; + -moz-transition: opacity 0.2s ease-in; + -o-transition: opacity 0.2s ease-in; + transition: opacity 0.2s ease-in; } -.icon-arrow-up:before { - content: "\f062"; +.media-item:hover { + z-index: 1; } -.icon-arrow-down:before { - content: "\f063"; +.media-item:hover .media-edit { + opacity: 1; } -.icon-share-alt:before { - content: "\f064"; +.media-view { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + border: 1px solid #dddddd; + overflow: hidden; + -webkit-transition: all 0.2s ease-in; + -moz-transition: all 0.2s ease-in; + -o-transition: all 0.2s ease-in; + transition: all 0.2s ease-in; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.icon-resize-full:before { - content: "\f065"; +.media-view:hover, +.media-view.hovered { + border-color: #810606; + -webkit-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.1); + box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.1); } -.icon-resize-small:before { - content: "\f066"; +.media-view:hover .banner, +.media-view.hovered .banner { + background-color: #810606; } -.icon-plus:before { - content: "\f067"; +.media-view span { + display: none; } -.icon-minus:before { - content: "\f068"; +.media-view .banner { + display: block; + background-color: #b7b7b7; + -webkit-transition: background-color 0.2s ease-in; + -moz-transition: background-color 0.2s ease-in; + -o-transition: background-color 0.2s ease-in; + transition: background-color 0.2s ease-in; } -.icon-asterisk:before { - content: "\f069"; +.media-image { + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } -.icon-exclamation-sign:before { - content: "\f06a"; +.media-heading { + font-size: 18px; + line-height: 1.3; + margin: 5px 0; } -.icon-gift:before { - content: "\f06b"; +.media-overlay { + position: relative; + min-height: 35px; } -.icon-leaf:before { - content: "\f06c"; +.media-overlay .media-heading { + position: absolute; + left: 0; + right: 0; + bottom: 0; + padding: 12px 10px; + margin: 0; + background-color: #000; + background-color: rgba(0, 0, 0, 0.8); + font-size: 13px; + color: #fff; + z-index: 1; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; } -.icon-fire:before { - content: "\f06d"; +.media-overlay .media-image { + float: none; + display: block; + margin-right: 0; } -.icon-eye-open:before { - content: "\f06e"; +.media-item.is-expander .truncator-link { + -webkit-transition: opacity 0.2s ease-in; + -moz-transition: opacity 0.2s ease-in; + -o-transition: opacity 0.2s ease-in; + transition: opacity 0.2s ease-in; + position: absolute; + z-index: 10; + left: 15px; + bottom: 15px; + opacity: 0; } -.icon-eye-close:before { - content: "\f070"; +.media-item.is-expander:hover { + padding-bottom: 35px; } -.icon-warning-sign:before { - content: "\f071"; +.media-item.is-expander:hover .truncator-link { + opacity: 1; } -.icon-plane:before { - content: "\f072"; +.wide .media-item { + width: 186px; } -.icon-calendar:before { - content: "\f073"; +.nav-simple, +.nav-aside { + *zoom: 1; + margin: 0; + list-style: none; + padding-bottom: 0; } -.icon-random:before { - content: "\f074"; +.nav-simple:before, +.nav-aside:before, +.nav-simple:after, +.nav-aside:after { + display: table; + content: ""; + line-height: 0; } -.icon-comment:before { - content: "\f075"; +.nav-simple:after, +.nav-aside:after { + clear: both; } -.icon-magnet:before { - content: "\f076"; +.nav-simple > li, +.nav-aside > li { + font-size: 12px; + line-height: 1.1666666666666667em; + padding: 7px 25px; + border-bottom: 1px dotted #dddddd; } -.icon-chevron-up:before { - content: "\f077"; +.nav-simple > li:last-of-type, +.nav-aside > li:last-of-type { + border-bottom: 0; } -.icon-chevron-down:before { - content: "\f078"; +.nav-simple .ckan-icon, +.nav-aside .ckan-icon { + position: relative; + top: 0px; } -.icon-retweet:before { - content: "\f079"; +.nav-aside { + border-top: 1px dotted #DDD; + border-bottom: 1px dotted #DDD; + margin-bottom: 15px; } -.icon-shopping-cart:before { - content: "\f07a"; +.nav-item > a, +.nav-aside li a { + color: #333333; + font-size: 14px; + line-height: 20px; + margin: -7px -25px; + padding: 7px 25px; } -.icon-folder-close:before { - content: "\f07b"; +.nav-item.active, +.nav-aside li.active { + background-color: #f6f6f6; } -.icon-folder-open:before { - content: "\f07c"; +.nav-item.active > a, +.nav-aside li.active a { + position: relative; + color: #ffffff; + background-color: #8ca0a6; } -.icon-resize-vertical:before { - content: "\f07d"; +.nav-item.active > a:hover, +.nav-aside li.active a:hover { + color: #ffffff; + background-color: #8ca0a6; } -.icon-resize-horizontal:before { - content: "\f07e"; +.nav-item.active > a:before, +.nav-aside li.active a:before { + content: ' '; + position: absolute; + top: 0; + right: -6px; + width: 6px; + height: 34px; + background-image: url("../../../base/images/nav-active.png?1"); } -.icon-bar-chart:before { - content: "\f080"; +.nav-item.active > a span, +.nav-aside li.active a span { + white-space: nowrap; + overflow: hidden; + display: block; } -.icon-twitter-sign:before { - content: "\f081"; +.module-narrow .nav-item > a, +.module-narrow .nav-aside li a { + padding-left: 15px; + padding-right: 15px; + position: relative; } -.icon-facebook-sign:before { - content: "\f082"; +.module-narrow .nav-item.image, +.module-narrow .nav-aside li.image { + position: relative; } -.icon-camera-retro:before { - content: "\f083"; +.module-narrow .nav-item.image > a, +.module-narrow .nav-aside li.image a { + padding-left: 42px; + padding-right: 42px; } -.icon-key:before { - content: "\f084"; +.module-narrow .nav-item.image > img, +.module-narrow .nav-aside li.image img { + position: absolute; + top: 50%; + left: 15px; + width: 20px; + height: 20px; + margin-top: -10px; + z-index: 2; } -.icon-cogs:before { - content: "\f085"; +.nav-facet .nav-item > a:hover:after, +.nav-facet .nav-item.active > a:after { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + content: ""; + position: absolute; + top: 50%; + right: 5px; + margin-top: -8px; } -.icon-comments:before { - content: "\f086"; +.nav-facet .nav-item > a:hover:after { + width: 17px; + height: 17px; + background-position: -17px -16px; } -.icon-thumbs-up:before { - content: "\f087"; +.nav-facet .nav-item.active > a:after { + width: 17px; + height: 17px; + background-position: 0px -16px; + right: 3px; } -.icon-thumbs-down:before { - content: "\f088"; +.user-list { + margin: 0; + list-style: none; } -.icon-star-half:before { - content: "\f089"; +.user-list li { + margin: 0 0 10px 0; } -.icon-heart-empty:before { - content: "\f08a"; +.user-list .gravatar { + vertical-align: -4px; + margin-right: 3px; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; } -.icon-signout:before { - content: "\f08b"; +.nav-facet-tertiary { + margin: 10px 0; } -.icon-linkedin-sign:before { - content: "\f08c"; +.nav-facet-tertiary .module-heading { + margin-bottom: 5px; + padding: 8px 12px; + border-bottom-width: 0; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; } -.icon-pushpin:before { - content: "\f08d"; +.nav-facet-tertiary .module-heading i { + display: none; } -.icon-external-link:before { - content: "\f08e"; +.nav-facet-tertiary .module-footer { + padding: 8px 12px; + border-top-width: 0; } -.icon-signin:before { - content: "\f090"; +.nav-facet-tertiary .module-footer a { + font-weight: normal; + color: #8C8C8C; } -.icon-trophy:before { - content: "\f091"; +.nav-facet-tertiary .nav { + margin-bottom: 0; } -.icon-github-sign:before { - content: "\f092"; +.nav-facet-tertiary .module-content.empty { + padding: 8px 12px; + margin-top: 0; } -.icon-upload-alt:before { - content: "\f093"; +.nav-facet-tertiary .nav li.active { + position: relative; } -.icon-lemon:before { - content: "\f094"; +.nav-facet-tertiary .nav li.active > a:hover:after, +.nav-facet-tertiary .nav li.active > a:after { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + width: 17px; + height: 17px; + background-position: 0px -16px; + content: ""; + position: absolute; + top: 50%; + right: 5px; + margin-top: -8px; } -.icon-phone:before { - content: "\f095"; +.nav-simple > .nav-btn { + padding-left: 0; + padding-right: 0; + text-align: center; } -.icon-check-empty:before { - content: "\f096"; +.nav-simple > .nav-btn .btn { + display: inline-block; } -.icon-bookmark-empty:before { - content: "\f097"; +.js .js-hide { + display: none; } -.icon-phone-sign:before { - content: "\f098"; +.js .js-hide.active { + display: block; } -.icon-twitter:before { - content: "\f099"; +.btn, +label { + font-weight: bold; } -.icon-facebook:before { - content: "\f09a"; +.btn-rounded { + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; + padding-left: 15px; + padding-right: 15px; } -.icon-github:before { - content: "\f09b"; +label { + cursor: pointer; + font-size: 14px; } -.icon-unlock:before { - content: "\f09c"; +label:after { + content: ":"; } -.icon-credit-card:before { - content: "\f09d"; +label.radio:after, +label.checkbox:after { + content: ""; } -.icon-rss:before { - content: "\f09e"; +input[type=radio], +input[type=checkbox] { + position: relative; + top: 7px; + padding: 0; + margin: 0; } -.icon-hdd:before { - content: "\f0a0"; +input[type=radio].checkbox-onown, +input[type=checkbox].checkbox-onown { + top: 0; } -.icon-bullhorn:before { - content: "\f0a1"; +select { + padding: 4px; } -.icon-bell:before { - content: "\f0a2"; +textarea { + max-width: 100%; } -.icon-certificate:before { - content: "\f0a3"; +.control-group .btn { + position: relative; + top: -2px; } -.icon-hand-right:before { - content: "\f0a4"; +.control-full input, +.control-full select, +.control-full textarea { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + height: auto; + width: 100%; } -.icon-hand-left:before { - content: "\f0a5"; +.control-medium input, +.control-medium select, +.control-medium textarea { + width: 320px; } -.icon-hand-up:before { - content: "\f0a6"; +.control-large input, +.control-large .control-label { + font-size: 17.5px; + line-height: 30px; } -.icon-hand-down:before { - content: "\f0a7"; +.control-large input { + height: 41px; } -.icon-circle-arrow-left:before { - content: "\f0a8"; +.form-actions { + background: none; + margin-left: -25px; + margin-right: -25px; + margin-bottom: 0; + padding-bottom: 0; + text-align: right; } -.icon-circle-arrow-right:before { - content: "\f0a9"; +.form-actions .action-info { + float: left; + width: 50%; + line-height: 2; + text-align: left; + color: #707070; + margin: 0; } -.icon-circle-arrow-up:before { - content: "\f0aa"; +.form-actions .action-info.small { + font-size: 11px; + line-height: 1.2; } -.icon-circle-arrow-down:before { - content: "\f0ab"; +.form-horizontal .control-label { + width: 120px; } -.icon-globe:before { - content: "\f0ac"; +.form-horizontal .controls { + margin-left: 130px; } -.icon-wrench:before { - content: "\f0ad"; +.form-horizontal .info-block { + position: relative; + display: block; + font-size: 11px; + color: #aaaaaa; + line-height: 1.3; + padding: 6px 0 6px 25px; + margin-top: 6px; } -.icon-tasks:before { - content: "\f0ae"; +.form-horizontal .info-help { + padding: 6px 0; } -.icon-filter:before { - content: "\f0b0"; +.form-horizontal .info-help:before { + display: none; } -.icon-briefcase:before { - content: "\f0b1"; +.form-horizontal .info-help-tight { + margin-top: -10px; } -.icon-fullscreen:before { - content: "\f0b2"; +.form-horizontal .info-inline { + float: right; + width: 265px; + margin-top: 0; + padding-bottom: 0; } -.icon-group:before { - content: "\f0c0"; +.form-horizontal .control-medium .info-block.info-inline { + width: 165px; } -.icon-link:before { - content: "\f0c1"; +.form-horizontal .info-block:before { + font-size: 2.2em; + position: absolute; + left: 0; + top: 2px; } -.icon-cloud:before { - content: "\f0c2"; +.form-horizontal .info-inline:before { + top: 8px; } -.icon-beaker:before { - content: "\f0c3"; +.info-block .icon-large, +.info-inline .icon-large { + float: left; + font-size: 22px; + margin-right: 15px; } -.icon-cut:before { - content: "\f0c4"; +.form-horizontal .info-block a { + color: #aaaaaa; + text-decoration: underline; } -.icon-copy:before { - content: "\f0c5"; +.form-horizontal .form-actions { + padding-left: 25px; + padding-right: 25px; } -.icon-paper-clip:before { - content: "\f0c6"; +.form-inline input { + padding-bottom: 9px; } -.icon-save:before { - content: "\f0c7"; +.form-inline select { + margin-top: 0; } -.icon-sign-blank:before { - content: "\f0c8"; +.form-inline .btn { + margin-left: 5px; } -.icon-reorder:before { - content: "\f0c9"; +.form-narrow label { + margin-bottom: 0; } -.icon-list-ul:before { - content: "\f0ca"; +.form-narrow select { + width: 100%; } -.icon-list-ol:before { - content: "\f0cb"; +.form-narrow .form-actions { + margin-left: -15px; + margin-right: -15px; + padding: 10px 15px 0; } -.icon-strikethrough:before { - content: "\f0cc"; +.form-select label { + margin-right: 5px; } -.icon-underline:before { - content: "\f0cd"; +.simple-input label, +.simple-input button { + display: none; } -.icon-table:before { - content: "\f0ce"; +.simple-input .field { + position: relative; } -.icon-magic:before { - content: "\f0d0"; +.simple-input .field-bordered { + border-bottom: 1px dotted #dddddd; } -.icon-truck:before { - content: "\f0d1"; +.simple-input .field input { + width: 100%; + height: auto; + margin: 0 -7px; + padding: 7px 5px; } -.icon-pinterest:before { - content: "\f0d2"; +.simple-input .field .btn-search { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + background-position: -51px -16px; + position: absolute; + display: block; + height: 17px; + width: 17px; + top: 50%; + right: 0; + margin-top: -8px; + background-color: transparent; + border: none; + text-indent: -999em; } -.icon-pinterest-sign:before { - content: "\f0d3"; +.editor textarea { + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; + border-bottom: none; } -.icon-google-plus-sign:before { - content: "\f0d4"; +.editor .editor-info-block { + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; + display: block; + float: none; + padding: 4px 10px; + background: #ebebeb; + width: auto; + border: 1px solid #cccccc; + border-top: none; + font-size: 11px; + color: #282828; } -.icon-google-plus:before { - content: "\f0d5"; +.editor .editor-info-block a { + color: #810606; + text-decoration: none; } -.icon-money:before { - content: "\f0d6"; +.control-custom { + font-size: 0; } -.icon-caret-down:before { - content: "\f0d7"; +.control-custom label { + margin-bottom: 0; } -.icon-caret-up:before { - content: "\f0d8"; +.control-custom input { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + width: 140px; } -.icon-caret-left:before { - content: "\f0d9"; +.control-custom input:last-of-type { + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; } -.icon-caret-right:before { - content: "\f0da"; +.control-custom .checkbox { + display: inline-block; + margin-left: 5px; } -.icon-columns:before { - content: "\f0db"; +.control-custom .checkbox input { + width: auto; } -.icon-sort:before { - content: "\f0dc"; +.control-custom.disabled label, +.control-custom.disabled input { + color: #aaaaaa; + text-decoration: line-through; + text-shadow: none; } -.icon-sort-down:before { - content: "\f0dd"; +.control-custom.disabled input { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + background-color: #f3f3f3; } -.icon-sort-up:before { - content: "\f0de"; +.control-custom.disabled .checkbox { + color: #444444; + text-decoration: none; } -.icon-envelope-alt:before { - content: "\f0e0"; +.control-custom .checkbox.btn { + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; + position: relative; + top: 0; + left: 5px; + height: 1px; + width: 9px; + padding: 3px 8px; + line-height: 18px; } -.icon-linkedin:before { - content: "\f0e1"; +.control-custom .checkbox.btn span { + display: none; + width: 30px; } -.icon-undo:before { - content: "\f0e2"; +.control-custom .checkbox.btn:before { + position: relative; + top: 1px; + left: -1px; + color: #fff; } -.icon-legal:before { - content: "\f0e3"; +.control-custom .checkbox.btn input { + display: none; } -.icon-dashboard:before { - content: "\f0e4"; +.control-custom.disabled .checkbox.btn { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #9e0707; + background-image: -moz-linear-gradient(top, #b20808, #810606); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b20808), to(#810606)); + background-image: -webkit-linear-gradient(top, #b20808, #810606); + background-image: -o-linear-gradient(top, #b20808, #810606); + background-image: linear-gradient(to bottom, #b20808, #810606); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb20808', endColorstr='#ff810606', GradientType=0); + border-color: #810606 #810606 #380303; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + *background-color: #810606; + /* Darken IE7 buttons by default so they stand out more given they won't have borders */ + + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } -.icon-comment-alt:before { - content: "\f0e5"; +.control-custom.disabled .checkbox.btn:hover, +.control-custom.disabled .checkbox.btn:focus, +.control-custom.disabled .checkbox.btn:active, +.control-custom.disabled .checkbox.btn.active, +.control-custom.disabled .checkbox.btn.disabled, +.control-custom.disabled .checkbox.btn[disabled] { + color: #ffffff; + background-color: #810606; + *background-color: #690505; } -.icon-comments-alt:before { - content: "\f0e6"; +.control-custom.disabled .checkbox.btn:active, +.control-custom.disabled .checkbox.btn.active { + background-color: #500404 \9; } -.icon-bolt:before { - content: "\f0e7"; +.control-custom.disabled .checkbox.btn .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; } -.icon-sitemap:before { - content: "\f0e8"; +.alert-danger a, +.alert-error a { + color: #b55457; } -.icon-umbrella:before { - content: "\f0e9"; +.control-group.error input, +.control-group.error select, +.control-group.error textarea, +.control-group.error .input-prepend .add-on, +.control-group.error .input-append .add-on { + border-color: #c6898b; } -.icon-paste:before { - content: "\f0ea"; +.error-inline { + color: #b55457; } -.icon-user-md:before { - content: "\f200"; +.error-block, +.error-inline { + font-size: 12px; } -.pill { - background-color: #cccccc; +.error-block { + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; + display: block; + padding: 6px 8px 3px; + background: #c6898b; + margin: -3px 0 0; color: #ffffff; - padding: 1px 5px 1px 8px; - margin-right: 5px; - -webkit-border-radius: 7px; - -moz-border-radius: 7px; - border-radius: 7px; + width: 208px; } -.pill a { - color: #ffffff; +.control-medium .error-block { + width: 318px; } -.pill a.remove { - font-size: 11px; +.control-full .error-block { + width: auto; } -.tag { - background: url("../../../base/images/background-tag.png") no-repeat -13px center; - position: relative; - display: block; - font-size: 11px; - line-height: 27px; - color: #5b0404; - padding-left: 10px; - padding-right: 5px; - margin-right: 11px; +.control-group.error .input-prepend .error-block, +.control-custom.error .error-block { + width: auto; } -.tag:before { - content: ""; - background: url("../../../base/images/background-tag.png") no-repeat center left; - position: absolute; - display: block; - top: 0; - bottom: 0; - right: -11px; - width: 11px; +.control-custom.error .error-block { + width: 401px; } -.unstyled { +.control-select.error .error-block { + width: 196px; +} +.stages { margin: 0; list-style: none; + *zoom: 1; + color: #aeaeae; + counter-reset: stage; + margin: -20px -25px 20px; + overflow: hidden; } -.simple-item { - font-size: 12px; - line-height: 1.1666666666666667em; - padding: 7px 25px; - border-bottom: 1px dotted #cccccc; -} -.simple-item:last-of-type { - border-bottom: 0; -} -.simple-list { - *zoom: 1; - margin: 0; - list-style: none; -} -.simple-list:before, -.simple-list:after { +.stages:before, +.stages:after { display: table; content: ""; + line-height: 0; } -.simple-list:after { +.stages:after { clear: both; } -.simple-list > li { - font-size: 12px; - line-height: 1.1666666666666667em; - padding: 7px 25px; - border-bottom: 1px dotted #cccccc; +.stages li { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + line-height: 27px; + counter-increment: stage; + width: 33.33%; + background-color: #ededed; + float: left; + padding: 10px 20px; + position: relative; + z-index: 0; } -.simple-list > li:last-of-type { - border-bottom: 0; +.stages li:before { + -webkit-border-radius: 14px; + -moz-border-radius: 14px; + border-radius: 14px; + content: counter(stage); + display: inline-block; + width: 27px; + height: 27px; + margin-right: 5px; + font-weight: bold; + text-align: center; + color: #ffffff; + background-color: #aeaeae; + z-index: 1; } -.simple-list .ckan-icon { - position: relative; - top: 0px; +.stages li:after { + left: 0; + border: solid rgba(237, 237, 237, 0); + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; + border-top-color: #ededed; + border-bottom-color: #ededed; + border-width: 29px; + top: 50%; + margin-top: -29px; + margin-left: -30px; } -.module-narrow .simple-list > li { - padding-left: 15px; - padding-right: 15px; +.stages li.last { position: relative; + right: -1px; } -.listing li { - text-align: right; - margin-bottom: 5px; -} -.listing .key { - clear: right; - font-weight: bold; +.stages li.last, +.stages li.last .highlight { + -webkit-border-radius: 0 3px 0 0; + -moz-border-radius: 0 3px 0 0; + border-radius: 0 3px 0 0; } -.js .tab-content { - display: none; +.stages li.first:after { + content: none; + border: none; } -.js .tab-content.active { - display: block; +.stages li.active:after { + border-color: rgba(140, 198, 138, 0); + border-top-color: #8cc68a; + border-bottom-color: #8cc68a; } -.module { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); - background-color: #ffffff; - margin-bottom: 20px; +.stages li.complete:after { + border-color: rgba(197, 226, 196, 0); + border-top-color: #c5e2c4; + border-bottom-color: #c5e2c4; } -.module-heading { - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - font-size: 14px; - line-height: 1.3; - padding: 7px 25px; - border-bottom: 1px solid #d0d0d0; - background-color: #f3f3f3; - background-image: -moz-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -ms-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f0f0f0)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -o-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: linear-gradient(top, #f5f5f5, #f0f0f0); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f0f0f0', GradientType=0); +.stages.stage-3 li.complete:first-child:after { + content: none; } -.module-heading-secondary { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - border-top: 1px solid #d0d0d0; +.stages li.active, +.stages li.complete { + background: none; } -.module-heading [class^=icon]:before { - font-size: 1.2em; - line-height: 1; - position: relative; - top: 1px; - margin-right: 0.1em; +.stages li.active:before { + color: #8cc68a; + background: #ffffff; } -.module-heading .action { - float: right; - color: #8c8c8c; - font-size: 11px; - text-decoration: underline; +.stages li.complete:before { + color: #c5e2c4; + background: #eef6ed; } -.module-content { - padding: 0 25px; - margin: 20px 0; +.stages li .highlight { + display: block; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + width: 100%; + padding: 10px 52px; + border: none; + text-align: left; + text-decoration: none; + line-height: 27px; + z-index: -1; } -.module-content:first-child { - margin-top: 0; - padding-top: 20px; +.stages li.active .highlight { + color: #ffffff; + background: #8cc68a; } -.module-content:last-child { - margin-bottom: 0; - padding-bottom: 20px; +.stages li.complete .highlight { + color: #eef6ed; + background: #c5e2c4; } -.module-content > :last-child { +.alert > :last-child { margin-bottom: 0; } -.module-border-top { - border-top: 1px dotted #cccccc; +.slug-preview { + font-size: 14px; + line-height: 1.5; + margin-top: 5px; + margin-left: 10px; } -.module-border-bottom { - border-bottom: 1px dotted #cccccc; +.slug-preview-value { + background-color: #faedcf; + margin-right: 3px; } -.module-footer { - padding: 7px 25px 7px; - border-top: 1px dotted #cccccc; +.resource-upload-field { + position: relative; + overflow: hidden; + display: inline-block; + vertical-align: bottom; } -.module .read-more { - font-weight: bold; - color: #000000; +.resource-upload-field label { + z-index: 0; } -.module .pagination { - height: 34px; - margin-bottom: 0; - border-top: 1px solid #d0d0d0; +.resource-upload-field input { + opacity: 0; + filter: alpha(opacity=0); + position: absolute; + top: 0; + right: 0; + z-index: 1; + margin: 0; + border: solid transparent; + border-width: 100px 0 0 200px; + cursor: pointer; + direction: ltr; + -moz-transform: translate(-300px, 0) scale(4); } -.module .pagination > ul { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - border: 0; +.resource-upload-field.loading { + display: inline-block; + background: url("../../../base/images/loading-spinner.gif") no-repeat center right; + padding-right: 5px; } -.module .pagination li a { - border-top: none; - border-bottom: none; +.select2-container .select2-choice input, +.select2-container-multi .select2-choices .select2-search-field:first-child input { + font-size: 14px; } -.module .pagination li:first-child a, -.module .pagination li:last-child a { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; +.select2-container-multi .select2-choices .select2-search-field input { + height: 29px; } -.module .pagination li:first-child a { - border-left-width: 0; +.select2-container .select2-choice input, +.select2-container-multi .select2-choices .select2-search-field:first-child input { + padding-left: 10px; } -.module .pagination li:last-child a { - border-right-width: 0; +.select2-container { + margin-top: 1px; } -.module .pagination li.active a { - border-left-width: 1px; - border-right-width: 1px; +.select2-container-multi { + margin-top: 0; } -.module .action { - text-align: center; +.select2-container-multi .select2-choices .select2-search-choice { + padding: 5px 8px 5px 22px; } -.module-shallow .module-content { - padding: 10px; - margin: 0; +.select2-container-multi.select2-container .select2-choices { + padding-top: 3px; + padding-bottom: 3px; } -.module-shallow .module-content:first-child { - padding-top: 10px; +.select2-search-choice-close, +.select2-container-multi .select2-search-choice-close { + top: 6px; + left: 5px; } -.module-shallow .module-content:last-child { - padding-bottom: 10px; -} -.module-shallow small { - font-size: 11px; - display: block; +.select2-container-multi .select2-choices { + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; + -moz-transition: border linear 0.2s, box-shadow linear 0.2s; + -o-transition: border linear 0.2s, box-shadow linear 0.2s; + transition: border linear 0.2s, box-shadow linear 0.2s; + background-color: #ffffff; + border: 1px solid #cccccc; } -.module-narrow .module-heading, -.module-narrow .module-content, -.module-narrow .module-footer { - padding-left: 15px; - padding-right: 15px; +.select2-container-active .select2-choices, +.select2-container-multi.select2-container-active .select2-choices { + border-color: rgba(82, 168, 236, 0.8); + outline: 0; + outline: thin dotted \9; + /* IE6-9 */ + + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); } -.module-grid { - margin: 0; - list-style: none; - margin: 0; - list-style: none; - *zoom: 1; - margin-left: -20px; - padding: 0; +.select2-container-multi .select2-drop { + margin-top: -2px; } -.module-grid:before, -.module-grid:after { - display: table; - content: ""; +.select2-container .select2-results li { + line-height: 18px; + padding-top: 4px; + padding-bottom: 4px; } -.module-grid:after { - clear: both; +.control-full .select2-container { + width: 520px !important; } -.module-item { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - width: 33.33%; - padding-left: 20px; - padding-bottom: 25px; - float: left; - float: left; - margin-left: 20px; - width: 460px; - padding-top: 10px; - padding-bottom: 10px; - padding-right: 50px; - overflow: hidden; - position: relative; +.control-group.error .select2-container input:focus, +.control-group.error .select2-container select:focus, +.control-group.error .select2-container textarea:focus { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } -.module-item.first { - clear: left; +.dataset-item { + border-bottom: 1px dotted #dddddd; + padding-bottom: 20px; + margin-bottom: 20px; } -.group .content img { - margin: 0 -5px 5px; - max-width: initial; +.dataset-item:last-of-type { + border-bottom: none; + margin-bottom: 0; + padding-bottom: 0; } -.group .content h3 { - font-size: 14px; +.dataset-heading { + font-size: 16px; + margin-top: 0; + margin-bottom: 8px; line-height: 1.3; } -.group-listing { - margin-left: -20px; +.dataset-heading a { + color: #333333; } -.ckanext-datapreview { +.dataset-heading .label { position: relative; + top: -1px; } -.ckanext-datapreview > iframe { - min-height: 400px; -} -.ckanext-datapreview > img { - max-height: 500px; - max-width: 100%; - overflow: hidden; +.dataset-private { + margin-right: 10px; + text-transform: uppercase; } -.package-info h4 { - margin-bottom: 10px; +.dataset-private .icon-lock { + width: 9px; } -.media { - position: relative; - overflow: hidden; +.dataset-private.pull-right { + margin-right: 0; } -.media-content > :last-child { - margin-bottom: 0; +.dataset-resources { + margin-top: 8px; } -.media-heading { - font-size: 14px; - line-height: 1.3em; - margin: 5px 0; +.dataset-resources li { + display: inline; } -.media-image, -.media .gravatar { - position: relative; - float: left; - margin-right: 10px; - overflow: hidden; +.dataset-resources li a { + background-color: #aaaaaa; } -.media-image:after { - -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3); - -moz-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3); - box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3); - content: ""; - position: absolute; +.dataset-heading .popular { top: 0; - left: 0; - right: 0; - bottom: 0; - z-index: 1; -} -.media-image img { - display: block; - margin: 0 auto; -} -.media-vertical .media-image, -.media-vertical .media-content { - float: none; - display: block; -} -.media-vertical .media-image { - margin-right: 0; - max-height: 125px; } -.media-grid, -ul.media-grid, -ol.media-grid { +.resource-list { margin: 0; list-style: none; - *zoom: 1; - margin-left: -20px; + margin: -10px -10px 10px -10px; } -.media-grid:before, -ul.media-grid:before, -ol.media-grid:before, -.media-grid:after, -ul.media-grid:after, -ol.media-grid:after { - display: table; - content: ""; +.resource-item { + position: relative; + padding: 10px 10px 10px 60px; + margin-bottom: 0px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.media-grid:after, -ul.media-grid:after, -ol.media-grid:after { - clear: both; +.resource-item:hover { + background-color: #eeeeee; } -.media-item { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - width: 33.33%; - padding-left: 20px; - padding-bottom: 25px; - float: left; +.resource-item .heading { + color: #000000; + font-size: 14px; + font-weight: bold; } -.media-item.first { - clear: left; +.resource-item .format-label { + position: absolute; + top: 10px; + left: 10px; } -.media-item .media-content { - min-height: 63px; +.resource-item .description { + font-size: 12px; + margin-bottom: 0; } -.related-item.expanded { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - background-color: #ffffff; - background-color: rgba(255, 255, 255, 0.9); - z-index: 2; +.resource-item .btn-group { + position: absolute; + top: 14px; + right: 10px; } -.media-wide { - padding: 0; +.dataset-resource-form .dataset-form-resource-types { + margin-bottom: 5px; } -.media-wide .media { - float: left; - margin-left: 20px; - width: 460px; +.dataset-form-resource-types .ckan-icon { + position: relative; + top: 3px; } -.media-overlay { +.dataset-form-resource-types .radio { + font-weight: normal; + padding-left: 0; + padding-right: 18px; +} +.dataset-form-resource-types label { position: relative; - min-height: 35px; } -.media-overlay .media-heading { - position: absolute; - left: 0; - right: 0; - bottom: 0; - padding: 12px 10px; - margin: 0; - background-color: #000; - background-color: rgba(0, 0, 0, 0.8); - font-size: 13px; - color: #fff; - z-index: 1; +.dataset-form-resource-types input[type=radio]:checked + label { + font-weight: bold; } -.media-overlay .media-image { - float: none; +.dataset-form-resource-types input[type=radio]:checked + label:after { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + width: 16px; + height: 16px; + background-position: -192px 0; display: block; - margin-right: 0; -} -.banner { - -webkit-transform: rotate(45deg); - -moz-transform: rotate(45deg); - -ms-transform: rotate(45deg); - -o-transform: rotate(45deg); - transform: rotate(45deg); - -webkit-transform-origin: center center; - -moz-transform-origin: center center; - -ms-transform-origin: center center; - -o-transform-origin: center center; - transform-origin: center center; + content: ""; position: absolute; - top: 15px; - right: -35px; - width: 80px; - color: #ffffff; - background: #707070; - padding: 1px 20px; - font-size: 11px; - text-align: center; - text-transform: uppercase; + top: auto; + left: 0; + bottom: -12px; } -.nav-simple { - *zoom: 1; +.dataset-form-resource-types input[type=radio] { + display: none; +} +.tag-list { margin: 0; list-style: none; - padding-bottom: 0; + padding: 10px 10px 5px 10px; } -.nav-simple:before, -.nav-simple:after { - display: table; - content: ""; +.tag-list li { + display: inline-block; + margin-right: 5px; } -.nav-simple:after { - clear: both; +.tag-list li:last-child { + margin-right: 0; } -.nav-simple > li { - font-size: 12px; - line-height: 1.1666666666666667em; - padding: 7px 25px; - border-bottom: 1px dotted #cccccc; +.additional-info td, +.additional-info th { + width: 50%; } -.nav-simple > li:last-of-type { - border-bottom: 0; +.label[data-format=html], +.label[data-format*=html] { + background-color: #55a1ce; } -.nav-simple .ckan-icon { - position: relative; - top: 0px; +.label[data-format=json], +.label[data-format*=json] { + background-color: #ef7100; } -.nav-item > a { - color: #333333; - margin: -7px -25px; - padding: 7px 25px; +.label[data-format=xml], +.label[data-format*=xml] { + background-color: #ef7100; } -.nav-item.active { - background-color: #f2f2f2; +.label[data-format=text], +.label[data-format*=text] { + background-color: #74cbec; } -.nav-item.active > a span { - white-space: nowrap; - overflow: hidden; - display: block; +.label[data-format=csv], +.label[data-format*=csv] { + background-color: #dfb100; +} +.label[data-format=xls], +.label[data-format*=xls] { + background-color: #2db55d; +} +.label[data-format=zip], +.label[data-format*=zip] { + background-color: #686868; +} +.label[data-format=api], +.label[data-format*=api] { + background-color: #ec96be; +} +.label[data-format=pdf], +.label[data-format*=pdf] { + background-color: #e0051e; +} +.label[data-format=rdf], +.label[data-format*=rdf], +.label[data-format*=nquad], +.label[data-format*=ntriples], +.label[data-format*=turtle] { + background-color: #0b4498; } -.nav-item.active > a { - background: url("../../../base/images/background-tag.png") no-repeat -13px center; +.search-form { + margin-bottom: 20px; + padding-bottom: 25px; + border-bottom: 1px dotted #dddddd; +} +.search-form .search-input { position: relative; - display: block; - font-size: 11px; - line-height: 27px; - color: #5b0404; - padding-left: 10px; - padding-right: 5px; - margin-right: 11px; + margin-bottom: 20px; +} +.search-form .search-input input { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; - font-size: 12px; - font-weight: bold; - position: relative; - left: 4px; - margin-left: -25px; - margin-right: -20px; - padding-left: 10px; - padding-right: 0px; - padding: 1px 22px; + margin: 0; + width: 100%; + height: auto; } -.nav-item.active > a:before { - content: ""; - background: url("../../../base/images/background-tag.png") no-repeat center left; +.search-form .search-input button { + cursor: pointer; + display: block; position: absolute; + top: 50%; + margin-top: -10px; + right: 10px; + height: 20px; + padding: 0; + border: none; + background: transparent; +} +.search-form .search-input button span { + display: none; +} +.search-form .search-input button i { + color: #cccccc; + -webkit-transition: color 0.2s ease-in; + -moz-transition: color 0.2s ease-in; + -o-transition: color 0.2s ease-in; + transition: color 0.2s ease-in; +} +.search-form .search-input button:hover i { + color: #000000; +} +.search-form .search-input.search-giant input { + font-size: 16px; + padding: 15px; +} +.search-form .search-input.search-giant button { + margin-top: -15px; + right: 15px; + height: 30px; +} +.search-form .search-input.search-giant button i { + font-size: 28px; + width: 28px; +} +.search-form .control-order-by { + float: right; + margin: 0 0 0 15px; +} +.search-form .control-order-by label, +.search-form .control-order-by select { + display: inline; +} +.search-form .control-order-by select { + width: 160px; + margin: 0; +} +.search-form h2 { + font-size: 24px; + line-height: 1.3; + color: #000000; + margin-bottom: 0; +} +.search-form .filter-list { + color: #444444; + line-height: 32px; + margin: 10px 0 0 0; +} +.search-form .filter-list .pill { + line-height: 21px; +} +.search-form .filter-list .extra { + margin-top: 10px; + font-size: 18px; + font-weight: normal; + color: #000000; +} +.tertiary .control-order-by { + float: none; + margin: 0; +} +.tertiary .control-order-by label { display: block; - top: 0; - bottom: 0; - right: -11px; - width: 11px; + margin-bottom: 5px; + font-weight: normal; + font-size: 12px; } -.nav-item [class^=icon] { - font-size: 1.2em; - margin: -1px 0 -1px -1px; +.tertiary .control-order-by select { + display: block; + font-size: 12px; + width: 100%; } -.module-narrow .nav-item > a { - padding-left: 15px; - padding-right: 15px; +.tertiary .search-input { + margin-bottom: 10px; +} +.group .media-vertical .image { + margin: 0 -5px 5px; +} +.group-list:nth-child(odd) { + clear: left; +} +.group-list .module-heading { + padding-top: 15px; + padding-bottom: 15px; +} +.group-list .dataset-content { + min-height: 54px; +} +.group-list .module-heading h3 { + margin-bottom: 2px; +} +.group-list .module-heading h3 a { + color: #333333; +} +.group-list .module-heading .media-image { + overflow: hidden; + max-height: 60px; +} +.group-list .module-heading .media-image img { + max-width: 85px; +} +.toolbar { + *zoom: 1; position: relative; + margin-bottom: 10px; + padding: 5px 0; } -.module-narrow .nav-item.active > a { - padding-left: 12px; - padding-right: 12px; +.toolbar:before, +.toolbar:after { + display: table; + content: ""; + line-height: 0; } -.module-narrow .nav-item.image { +.toolbar:after { + clear: both; +} +.page_primary_action { + margin-bottom: 20px; +} +.toolbar .breadcrumb { + *zoom: 1; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; position: relative; + float: left; + margin: 0; + padding: 0; + border: none; + background: none; + font-size: 20px; + line-height: 1.3; } -.module-narrow .nav-item.image > a { - padding-left: 42px; - padding-right: 42px; +.toolbar .breadcrumb:before, +.toolbar .breadcrumb:after { + display: table; + content: ""; + line-height: 0; +} +.toolbar .breadcrumb:after { + clear: both; +} +.toolbar .breadcrumb li:after { + content: " / "; +} +.toolbar .breadcrumb li.active:after { + content: ""; +} +.toolbar .breadcrumb li:last-of-type:after { + content: ""; +} +.toolbar .home a { + text-decoration: none; +} +.toolbar .home span { + display: none; +} +.toolbar .breadcrumb a { + color: #505050; +} +.toolbar .breadcrumb .active a, +.toolbar .breadcrumb a.active { + font-weight: bold; } -.module-narrow .nav-item.image > img { +.actions { + margin: 0; + list-style: none; position: absolute; - top: 50%; - left: 15px; - width: 20px; - height: 20px; - margin-top: -10px; - z-index: 2; + top: 10px; + right: 10px; + z-index: 1; +} +.actions li { + display: inline-block; + margin-right: 5px; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; +} +.actions li:last-of-type { + margin-right: 0; +} +.hide-heading { + display: none; +} +.page-header { + *zoom: 1; + border-bottom: 1px solid #dddddd; + background-color: #f6f6f6; + -webkit-border-radius: 0 3px 0 0; + -moz-border-radius: 0 3px 0 0; + border-radius: 0 3px 0 0; +} +.page-header:before, +.page-header:after { + display: table; + content: ""; + line-height: 0; +} +.page-header:after { + clear: both; +} +.page-header .nav-tabs { + float: left; + margin-bottom: -1px; +} +.page-header .nav-tabs li.active a, +.page-header .nav-tabs a:hover { + background-color: #ffffff; +} +.page-header .content_action { + float: right; + margin-top: -5px; + margin-right: -7px; +} +.no-nav .page-header { + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; +} +h1 { + font-size: 28px; +} +h2 { + font-size: 21px; +} +h3 { + font-size: 18px; +} +h4 { + font-size: 14px; +} +h1, +h2, +h3, +h4 { + line-height: 1.5; +} +h1 small, +h2 small, +h3 small, +h4 small { + font-size: 14px; +} +.prose h1, +.prose heading-1 h2, +.prose heading-2 { + margin-bottom: 15px; +} +.prose h3, +.prose heading-3 { + margin-bottom: 10px; +} +.table-chunky td, +.table-chunky th { + padding: 12px 15px; + font-size: 12px; +} +.table-chunky thead th, +.table-chunky thead td { + color: #ffffff; + background-color: #aaaaaa; + padding-top: 10px; + padding-bottom: 10px; +} +.table-striped tbody tr:nth-child(odd) td, +.table-striped tbody tr:nth-child(odd) th { + background-color: transparent; +} +.table-striped tbody tr:nth-child(even) td, +.table-striped tbody tr:nth-child(even) th { + background-color: #f2f2f2; +} +.table-chunky.table-bordered { + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; +} +.table-chunky.table-bordered thead:first-child tr:first-child th:first-child, +.table-chunky.table-bordered tbody:first-child tr:first-child td:first-child { + -webkit-border-top-left-radius: 2px; + -moz-border-radius-topleft: 2px; + border-top-left-radius: 2px; +} +.table-chunky.table-bordered thead:first-child tr:first-child th:last-child, +.table-chunky.table-bordered tbody:first-child tr:first-child td:last-child { + -webkit-border-top-right-radius: 2px; + -moz-border-radius-topright: 2px; + border-top-right-radius: 2px; +} +.table-chunky.table-bordered thead:last-child tr:last-child th:first-child, +.table-chunky.table-bordered tbody:last-child tr:last-child td:first-child { + -webkit-border-radius: 0 0 0 2px; + -moz-border-radius: 0 0 0 2px; + border-radius: 0 0 0 2px; + -webkit-border-bottom-left-radius: 2px; + -moz-border-radius-bottomleft: 2px; + border-bottom-left-radius: 2px; +} +.table-chunky.table-bordered thead:last-child tr:last-child th:last-child, +.table-chunky.table-bordered tbody:last-child tr:last-child td:last-child { + -webkit-border-bottom-right-radius: 2px; + -moz-border-radius-bottomright: 2px; + border-bottom-right-radius: 2px; +} +.ellipsis { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.ckan-icon { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; +} +.ckan-icon-fb { + width: 16px; + height: 16px; + background-position: 0px 0; +} +.ckan-icon-gplus { + width: 16px; + height: 16px; + background-position: -16px 0; +} +.ckan-icon-twitter { + width: 16px; + height: 16px; + background-position: -32px 0; +} +.ckan-icon-email { + width: 16px; + height: 16px; + background-position: -48px 0; +} +.ckan-icon-share { + width: 16px; + height: 16px; + background-position: -64px 0; +} +.ckan-icon-feed { + width: 16px; + height: 16px; + background-position: -80px 0; +} +.ckan-icon-calendar { + width: 16px; + height: 16px; + background-position: -96px 0; +} +.ckan-icon-file { + width: 16px; + height: 16px; + background-position: -112px 0; +} +.ckan-icon-lock { + width: 16px; + height: 16px; + background-position: -128px 0; +} +.ckan-icon-link-file { + width: 16px; + height: 16px; + background-position: -144px 0; +} +.ckan-icon-link-plugin { + width: 16px; + height: 16px; + background-position: -160px 0; +} +.ckan-icon-upload-file { + width: 16px; + height: 16px; + background-position: -176px 0; +} +.ckan-icon-callout { + width: 16px; + height: 16px; + background-position: -192px 0; +} +.ckan-icon-circle-cross { + width: 17px; + height: 17px; + background-position: 0px -16px; +} +.ckan-icon-circle-add { + width: 17px; + height: 17px; + background-position: -17px -16px; +} +.ckan-icon-flame { + width: 17px; + height: 17px; + background-position: -34px -16px; +} +.ckan-icon-search { + width: 17px; + height: 17px; + background-position: -51px -16px; +} +.ckan-icon-large-lock { + width: 20px; + height: 20px; + background-position: 0px -33px; +} +.ckan-icon-photo { + width: 20px; + height: 20px; + background-position: -20px -33px; +} +.ckan-icon-add { + width: 20px; + height: 20px; + background-position: -40px -33px; +} +.ckan-icon-home { + width: 20px; + height: 20px; + background-position: -60px -33px; +} +.ckan-icon-rewind { + width: 20px; + height: 20px; + background-position: -80px -33px; +} +.ckan-icon-tools { + width: 20px; + height: 20px; + background-position: -100px -33px; +} +.ckan-icon-flag { + width: 20px; + height: 20px; + background-position: -120px -33px; +} +.ckan-icon-clipboard { + width: 20px; + height: 20px; + background-position: -140px -33px; +} +.ckan-icon-share { + width: 20px; + height: 20px; + background-position: -160px -33px; +} +.ckan-icon-info { + width: 20px; + height: 20px; + background-position: -180px -33px; +} +.ckan-icon-download { + width: 20px; + height: 20px; + background-position: -200px -33px; +} +.ckan-icon-star { + width: 20px; + height: 20px; + background-position: -220px -33px; +} +.ckan-icon-info-flat { + width: 20px; + height: 20px; + background-position: -240px -33px; +} +.ckan-icon-tag { + width: 20px; + height: 20px; + background-position: -260px -33px; +} +.ckan-icon-plus { + width: 20px; + height: 20px; + background-position: -280px -33px; + width: 16px; +} +.ckan-icon-head { + width: 20px; + height: 20px; + background-position: -300px -33px; +} +.ckan-icon-arrow-e { + width: 20px; + height: 20px; + background-position: -320px -33px; + width: 16px; +} +.ckan-icon-bookmark { + width: 25px; + height: 25px; + background-position: 0px -53px; } -.nav-facet .nav-item > a:hover:after, -.nav-facet .nav-item.active > a:after { +.format-label { *margin-right: .3em; display: inline-block; vertical-align: text-bottom; @@ -4988,1745 +6836,1147 @@ ol.media-grid:after { background-image: url("../../../base/images/sprite-ckan-icons.png"); background-repeat: no-repeat; background-position: 16px 16px; - content: ""; - position: absolute; - top: 50%; - right: 5px; - margin-top: -8px; -} -.nav-facet .nav-item > a:hover:after:last-child, -.nav-facet .nav-item.active > a:after:last-child { - *margin-left: 0; -} -.nav-facet .nav-item > a:hover:after { - width: 17px; - height: 17px; - background-position: -17px -16px; -} -.nav-facet .nav-item.active > a:after { - width: 17px; - height: 17px; - background-position: 0px -16px; - right: 3px; -} -.js .js-hide { - display: none; + text-indent: -900em; + background: url("../../../base/images/sprite-resource-icons.png") no-repeat 0 0; } -.js .js-hide.active { - display: block; +.format-label { + width: 32px; + height: 35px; + background-position: 0px -62px; } -.btn, -label { - font-weight: bold; +.format-label[data-format=rdf], +.format-label[data-format*=rdf] { + width: 32px; + height: 35px; + background-position: -32px -62px; } -label { - cursor: pointer; - font-size: 14px; - line-height: 2; +.format-label[data-format=pdf], +.format-label[data-format*=pdf] { + width: 32px; + height: 35px; + background-position: -64px -62px; } -label:after { - content: ":"; +.format-label[data-format=api], +.format-label[data-format*=api] { + width: 32px; + height: 35px; + background-position: -96px -62px; } -label.radio:after, -label.checkbox:after { - content: ""; +.format-label[data-format=zip], +.format-label[data-format*=zip] { + width: 32px; + height: 35px; + background-position: -128px -62px; } -input, -textarea, -select, -.uneditable-input { - font-size: 14px; - padding: 8px 10px; +.format-label[data-format=xls], +.format-label[data-format*=xls] { + width: 32px; + height: 35px; + background-position: -160px -62px; } -input[type=radio], -input[type=checkbox] { - position: relative; - top: 7px; - padding: 0; - margin: 0; +.format-label[data-format=csv], +.format-label[data-format*=csv] { + width: 32px; + height: 35px; + background-position: -192px -62px; } -input[type=radio].checkbox-onown, -input[type=checkbox].checkbox-onown { - top: 0; +.format-label[data-format=txt], +.format-label[data-format*=txt] { + width: 32px; + height: 35px; + background-position: -224px -62px; } -select { - margin-top: 6px; - padding: 4px; +.format-label[data-format=xml], +.format-label[data-format*=xml] { + width: 32px; + height: 35px; + background-position: -256px -62px; } -textarea { - max-width: 100%; +.format-label[data-format=json], +.format-label[data-format*=json] { + width: 32px; + height: 35px; + background-position: -288px -62px; } -.input-prepend .add-on { - padding: 8px 8px; - font-size: 14px; +.format-label[data-format=html], +.format-label[data-format*=html] { + width: 32px; + height: 35px; + background-position: -320px -62px; } -.control-group .btn { - position: relative; - top: -2px; +/* This is a modified version of the font-awesome core less document. */ +@font-face { + font-family: 'FontAwesome'; + src: url('../../../base/vendor/font-awesome/font/fontawesome-webfont.eot?v=3.0.1'); + src: url('../../../base/vendor/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.0.1') format('embedded-opentype'), url('../../../base/vendor/font-awesome/font/fontawesome-webfont.woff?v=3.0.1') format('woff'), url('../../../base/vendor/font-awesome/font/fontawesome-webfont.ttf?v=3.0.1') format('truetype'); + font-weight: normal; + font-style: normal; } -.control-full input, -.control-full select, -.control-full textarea { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; +[class^="icon-"], +[class*=" icon-"] { + font-family: FontAwesome; + font-weight: normal; + font-style: normal; + text-decoration: inherit; + -webkit-font-smoothing: antialiased; + display: inline; + width: auto; height: auto; - width: 100%; -} -.control-medium input, -.control-medium select, -.control-medium textarea { - width: 320px; -} -.control-large input, -.control-large .control-label { - font-size: 18px; -} -.form-actions { - background: none; - margin-left: -25px; - margin-right: -25px; - margin-bottom: 0; - padding-bottom: 0; - text-align: right; -} -.form-actions .action-info { - float: left; - width: 50%; - line-height: 2; - text-align: left; - color: #707070; - margin: 0; -} -.form-actions .action-info.small { - font-size: 11px; - line-height: 1.2; -} -.form-horizontal .control-label { - width: 120px; - line-height: 1.3; - padding-top: 9px; -} -.form-horizontal .control-large input, -.form-horizontal .control-large .control-label { - font-size: 18px; - line-height: 2; -} -.form-horizontal .control-large .control-label { - padding-top: 10px; + line-height: normal; + vertical-align: baseline; + background-image: none; + background-position: 0% 0%; + background-repeat: repeat; + margin-top: 0; } -.form-horizontal .controls { - margin-left: 130px; +.icon-spin { + display: inline-block; + -moz-animation: spin 2s infinite linear; + -o-animation: spin 2s infinite linear; + -webkit-animation: spin 2s infinite linear; + animation: spin 2s infinite linear; +} +@-moz-keyframes spin { + 0% { + -moz-transform: rotate(0deg); + } + 100% { + -moz-transform: rotate(359deg); + } } -.form-horizontal .info-block { - position: relative; - display: block; - font-size: 11px; - color: #aeaeae; - line-height: 1.3; - padding: 6px 0 6px 25px; - margin-top: 6px; +@-webkit-keyframes spin { + 0% { + -webkit-transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + } } -.form-horizontal .info-inline { - float: right; - width: 265px; - margin-top: 0; +@-o-keyframes spin { + 0% { + -o-transform: rotate(0deg); + } + 100% { + -o-transform: rotate(359deg); + } } -.form-horizontal .control-medium .info-block.info-inline { - width: 165px; +@-ms-keyframes spin { + 0% { + -ms-transform: rotate(0deg); + } + 100% { + -ms-transform: rotate(359deg); + } } -.form-horizontal .info-block:before { - font-size: 2.2em; - position: absolute; - left: 0; - top: 2px; +@keyframes spin { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(359deg); + } } -.form-horizontal .info-inline:before { - top: 8px; +@-moz-document url-prefix() { + .icon-spin { + height: .9em; + } + .btn .icon-spin { + height: auto; + } + .icon-spin.icon-large { + height: 1.25em; + } + .btn .icon-spin.icon-large { + height: .75em; + } } -.info-block .icon-large, -.info-inline .icon-large { - float: left; - font-size: 22px; - margin-right: 15px; +/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen + readers do not read off random characters that represent icons */ +.icon-glass:before { + content: "\f000"; } -.form-horizontal .info-block a { - color: #aeaeae; - text-decoration: underline; +.icon-music:before { + content: "\f001"; } -.form-horizontal .form-actions { - padding-left: 25px; - padding-right: 25px; +.icon-search:before { + content: "\f002"; } -.form-inline input { - padding-bottom: 9px; +.icon-envelope:before { + content: "\f003"; } -.form-inline select { - margin-top: 0; +.icon-heart:before { + content: "\f004"; } -.form-inline .btn { - margin-left: 5px; +.icon-star:before { + content: "\f005"; } -.form-narrow label { - margin-bottom: 0; +.icon-star-empty:before { + content: "\f006"; } -.form-narrow select { - width: 100%; +.icon-user:before { + content: "\f007"; } -.form-narrow .form-actions { - margin-left: -15px; - margin-right: -15px; - padding: 10px 15px 0; +.icon-film:before { + content: "\f008"; } -.form-select label { - margin-right: 5px; +.icon-th-large:before { + content: "\f009"; } -.simple-input label, -.simple-input button { - display: none; +.icon-th:before { + content: "\f00a"; } -.simple-input .field { - position: relative; +.icon-th-list:before { + content: "\f00b"; } -.simple-input .field-bordered { - border-bottom: 1px dotted #cccccc; +.icon-ok:before { + content: "\f00c"; } -.simple-input .field input { - width: 100%; - height: auto; - margin: 0 -7px; - padding: 7px 5px; +.icon-remove:before { + content: "\f00d"; } -.simple-input .field .btn-search { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - width: 17px; - height: 17px; - background-position: -51px -16px; - position: absolute; - display: block; - height: 17px; - width: 17px; - top: 50%; - right: 0; - margin-top: -8px; - background-color: transparent; - border: none; - text-indent: -999em; +.icon-zoom-in:before { + content: "\f00e"; } -.simple-input .field .btn-search:last-child { - *margin-left: 0; +.icon-zoom-out:before { + content: "\f010"; } -.editor textarea { - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - border-bottom: none; +.icon-off:before { + content: "\f011"; } -.editor .editor-info-block { - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - display: block; - float: none; - padding: 4px 10px; - background: #ebebeb; - width: auto; - border: 1px solid #cccccc; - border-top: none; - font-size: 11px; - color: #282828; +.icon-signal:before { + content: "\f012"; } -.editor .editor-info-block a { - color: #5b0404; - text-decoration: none; +.icon-cog:before { + content: "\f013"; } -.control-custom { - font-size: 0; +.icon-trash:before { + content: "\f014"; } -.control-custom label { - margin-bottom: 0; +.icon-home:before { + content: "\f015"; } -.control-custom input { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - width: 140px; +.icon-file:before { + content: "\f016"; } -.control-custom input:last-of-type { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; +.icon-time:before { + content: "\f017"; } -.control-custom .checkbox { - display: inline-block; - margin-left: 5px; +.icon-road:before { + content: "\f018"; } -.control-custom .checkbox input { - width: auto; +.icon-download-alt:before { + content: "\f019"; } -.control-custom.disabled label, -.control-custom.disabled input { - color: #aaaaaa; - text-decoration: line-through; - text-shadow: none; +.icon-download:before { + content: "\f01a"; } -.control-custom.disabled input { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - background-color: #f3f3f3; +.icon-upload:before { + content: "\f01b"; } -.control-custom.disabled .checkbox { - color: #4d4d4d; - text-decoration: none; +.icon-inbox:before { + content: "\f01c"; } -.control-custom .checkbox.btn { - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; - position: relative; - top: 0; - left: 5px; - height: 3px; - width: 8px; - padding: 3px 8px; +.icon-play-circle:before { + content: "\f01d"; } -.control-custom .checkbox.btn span { - display: none; - width: 30px; +.icon-repeat:before { + content: "\f01e"; } -.control-custom .checkbox.btn:before { - position: relative; - top: 1px; - left: -1px; - color: #fff; +/* \f020 doesn't work in Safari. all shifted one down */ +.icon-refresh:before { + content: "\f021"; } -.control-custom .checkbox.btn input { - display: none; +.icon-list-alt:before { + content: "\f022"; } -.control-custom.disabled .checkbox.btn { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #dd0c0c; - background-image: -moz-linear-gradient(top, #cf0a0a, #f21010); - background-image: -ms-linear-gradient(top, #cf0a0a, #f21010); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cf0a0a), to(#f21010)); - background-image: -webkit-linear-gradient(top, #cf0a0a, #f21010); - background-image: -o-linear-gradient(top, #cf0a0a, #f21010); - background-image: linear-gradient(top, #cf0a0a, #f21010); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cf0a0a', endColorstr='#f21010', GradientType=0); - border-color: #f21010 #f21010 #ac0909; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #f21010; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-lock:before { + content: "\f023"; } -.control-custom.disabled .checkbox.btn:hover, -.control-custom.disabled .checkbox.btn:active, -.control-custom.disabled .checkbox.btn.active, -.control-custom.disabled .checkbox.btn.disabled, -.control-custom.disabled .checkbox.btn[disabled] { - background-color: #f21010; - *background-color: #dd0c0c; +.icon-flag:before { + content: "\f024"; } -.control-custom.disabled .checkbox.btn:active, -.control-custom.disabled .checkbox.btn.active { - background-color: #c40b0b \9; +.icon-headphones:before { + content: "\f025"; } -.control-custom.disabled .checkbox.btn .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-volume-off:before { + content: "\f026"; } -.alert-danger a, -.alert-error a { - color: #b55457; +.icon-volume-down:before { + content: "\f027"; } -.control-group.error input, -.control-group.error select, -.control-group.error textarea, -.control-group.error .input-prepend .add-on, -.control-group.error .input-append .add-on { - border-color: #c6898b; +.icon-volume-up:before { + content: "\f028"; } -.error-inline { - color: #b55457; +.icon-qrcode:before { + content: "\f029"; } -.error-block, -.error-inline { - font-size: 12px; +.icon-barcode:before { + content: "\f02a"; } -.error-block { - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - display: block; - padding: 6px 8px 3px; - background: #c6898b; - margin: -3px 0 0; - color: #ffffff; - width: 216px; +.icon-tag:before { + content: "\f02b"; } -.control-medium .error-block { - width: 326px; +.icon-tags:before { + content: "\f02c"; } -.control-full .error-block { - width: auto; +.icon-book:before { + content: "\f02d"; } -.control-group.error .input-prepend .error-block, -.control-custom.error .error-block { - margin-left: -1px; - width: auto; +.icon-bookmark:before { + content: "\f02e"; } -.control-custom.error .error-block { - width: 409px; +.icon-print:before { + content: "\f02f"; } -.control-select.error .error-block { - width: 204px; +.icon-camera:before { + content: "\f030"; } -.stages { - margin: 0; - list-style: none; - *zoom: 1; - color: #aeaeae; - counter-reset: stage; - margin: -20px -25px 20px; - overflow: hidden; +.icon-font:before { + content: "\f031"; } -.stages:before, -.stages:after { - display: table; - content: ""; +.icon-bold:before { + content: "\f032"; } -.stages:after { - clear: both; +.icon-italic:before { + content: "\f033"; } -.stages li { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - line-height: 27px; - counter-increment: stage; - width: 33.33%; - background-color: #ededed; - float: left; - padding: 10px 20px; - position: relative; - z-index: 0; +.icon-text-height:before { + content: "\f034"; } -.stages li:before { - -webkit-border-radius: 14px; - -moz-border-radius: 14px; - border-radius: 14px; - content: counter(stage); - display: inline-block; - width: 27px; - height: 27px; - margin-right: 5px; - font-weight: bold; - text-align: center; - color: #ffffff; - background-color: #aeaeae; - z-index: 1; +.icon-text-width:before { + content: "\f035"; } -.stages li:after { - left: 0; - border: solid rgba(237, 237, 237, 0); - content: " "; - height: 0; - width: 0; - position: absolute; - pointer-events: none; - border-top-color: #ededed; - border-bottom-color: #ededed; - border-width: 29px; - top: 50%; - margin-top: -29px; - margin-left: -30px; +.icon-align-left:before { + content: "\f036"; } -.stages li.first, -.stages li.first .highlight { - -webkit-border-radius: 3px 0 0 0; - -moz-border-radius: 3px 0 0 0; - border-radius: 3px 0 0 0; +.icon-align-center:before { + content: "\f037"; } -.stages li.last { - position: relative; - right: -1px; +.icon-align-right:before { + content: "\f038"; } -.stages li.last, -.stages li.last .highlight { - -webkit-border-radius: 0 3px 0 0; - -moz-border-radius: 0 3px 0 0; - border-radius: 0 3px 0 0; +.icon-align-justify:before { + content: "\f039"; } -.stages li.first:after { - content: none; - border: none; +.icon-list:before { + content: "\f03a"; } -.stages li.active:after { - border-color: rgba(140, 198, 138, 0); - border-top-color: #8cc68a; - border-bottom-color: #8cc68a; +.icon-indent-left:before { + content: "\f03b"; } -.stages li.complete:after { - border-color: rgba(197, 226, 196, 0); - border-top-color: #c5e2c4; - border-bottom-color: #c5e2c4; +.icon-indent-right:before { + content: "\f03c"; } -.stages.stage-3 li.complete:first-child:after { - content: none; +.icon-facetime-video:before { + content: "\f03d"; } -.stages li.active, -.stages li.complete { - background: none; +.icon-picture:before { + content: "\f03e"; } -.stages li.active:before { - color: #8cc68a; - background: #ffffff; +.icon-pencil:before { + content: "\f040"; } -.stages li.complete:before { - color: #c5e2c4; - background: #eef6ed; +.icon-map-marker:before { + content: "\f041"; } -.stages li .highlight { - display: block; - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - width: 100%; - padding: 10px 52px; - border: none; - text-align: left; - text-decoration: none; - line-height: 27px; - z-index: -1; +.icon-adjust:before { + content: "\f042"; } -.stages li.active .highlight { - color: #ffffff; - background: #8cc68a; +.icon-tint:before { + content: "\f043"; } -.stages li.complete .highlight { - color: #eef6ed; - background: #c5e2c4; +.icon-edit:before { + content: "\f044"; } -.alert > :last-child { - margin-bottom: 0; +.icon-share:before { + content: "\f045"; } -.slug-preview { - font-size: 14px; - line-height: 1.5; - margin-top: 5px; - margin-left: 10px; +.icon-check:before { + content: "\f046"; } -.slug-preview-value { - background-color: #faedcf; - margin-right: 3px; +.icon-move:before { + content: "\f047"; } -.slug-preview .btn { - padding-top: 3px; - padding-bottom: 3px; +.icon-step-backward:before { + content: "\f048"; } -.resource-upload-field { - position: relative; - overflow: hidden; - display: inline-block; - vertical-align: bottom; +.icon-fast-backward:before { + content: "\f049"; } -.resource-upload-field label { - z-index: 0; +.icon-backward:before { + content: "\f04a"; } -.resource-upload-field input { - opacity: 0; - filter: alpha(opacity=0); - position: absolute; - top: 0; - right: 0; - z-index: 1; - margin: 0; - border: solid transparent; - border-width: 100px 0 0 200px; - cursor: pointer; - direction: ltr; - -moz-transform: translate(-300px, 0) scale(4); +.icon-play:before { + content: "\f04b"; } -.resource-upload-field.loading { - display: inline-block; - background: url("../../../base/images/loading-spinner.gif") no-repeat center right; - padding-right: 5px; +.icon-pause:before { + content: "\f04c"; } -.select2-container .select2-choice input, -.select2-container-multi .select2-choices .select2-search-field:first-child input { - font-size: 14px; +.icon-stop:before { + content: "\f04d"; } -.select2-container-multi .select2-choices .select2-search-field input { - height: 29px; +.icon-forward:before { + content: "\f04e"; } -.select2-container .select2-choice input, -.select2-container-multi .select2-choices .select2-search-field:first-child input { - padding-left: 10px; +.icon-fast-forward:before { + content: "\f050"; } -.select2-container { - margin-top: 5px; +.icon-step-forward:before { + content: "\f051"; } -.select2-container-multi { - margin-top: 0; +.icon-eject:before { + content: "\f052"; } -.select2-container-multi .select2-choices .select2-search-choice { - padding: 5px 8px 5px 22px; +.icon-chevron-left:before { + content: "\f053"; } -.select2-container-multi.select2-container .select2-choices { - padding-top: 3px; - padding-bottom: 3px; +.icon-chevron-right:before { + content: "\f054"; } -.select2-search-choice-close, -.select2-container-multi .select2-search-choice-close { - top: 6px; - left: 5px; +.icon-plus-sign:before { + content: "\f055"; } -.select2-container-multi .select2-choices { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; - background-color: #ffffff; - border: 1px solid #cccccc; +.icon-minus-sign:before { + content: "\f056"; } -.select2-container-active .select2-choices, -.select2-container-multi.select2-container-active .select2-choices { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); +.icon-remove-sign:before { + content: "\f057"; } -.select2-container-multi .select2-drop { - margin-top: -2px; +.icon-ok-sign:before { + content: "\f058"; } -.select2-container .select2-results li { - line-height: 18px; - padding-top: 4px; - padding-bottom: 4px; +.icon-question-sign:before { + content: "\f059"; } -.control-full .select2-container { - width: 520px !important; +.icon-info-sign:before { + content: "\f05a"; } -.dataset-item { - border-bottom: 1px dotted #cccccc; - padding-bottom: 20px; - margin-bottom: 20px; +.icon-screenshot:before { + content: "\f05b"; } -.dataset-item:last-of-type { - border-bottom: none; - margin-bottom: 0; - padding-bottom: 0; +.icon-remove-circle:before { + content: "\f05c"; } -.dataset-heading { - font-size: 14px; - line-height: 1.3; +.icon-ok-circle:before { + content: "\f05d"; } -.dataset-heading a { - color: #333333; +.icon-ban-circle:before { + content: "\f05e"; } -.dataset-heading .label { - position: relative; - top: -1px; +.icon-arrow-left:before { + content: "\f060"; } -.dataset-content { - font-size: 12px; +.icon-arrow-right:before { + content: "\f061"; } -.dataset-resources { - font-size: 10px; - line-height: 14px; - margin-top: 5px; +.icon-arrow-up:before { + content: "\f062"; } -.dataset-resources li { - display: inline; +.icon-arrow-down:before { + content: "\f063"; } -.dataset-resources li a { - background-color: #aaaaaa; +.icon-share-alt:before { + content: "\f064"; } -.dataset-heading .popular { - top: 0; +.icon-resize-full:before { + content: "\f065"; } -.results { - margin-bottom: 20px; - padding-bottom: 25px; - border-bottom: 1px dotted #cccccc; +.icon-resize-small:before { + content: "\f066"; } -.results strong { - display: block; - font-size: 24px; - line-height: 1.3; - color: #000000; - margin-bottom: 10px; +.icon-plus:before { + content: "\f067"; } -.results strong:before { - float: right; - content: " "; - width: 280px; - white-space: pre; +.icon-minus:before { + content: "\f068"; } -.filter-list { - color: #4d4d4d; - font-weight: bold; +.icon-asterisk:before { + content: "\f069"; } -.filter-list .extra { - margin-top: 10px; - font-size: 18px; - font-weight: normal; - color: #000000; +.icon-exclamation-sign:before { + content: "\f06a"; } -.dataset-search { - position: relative; +.icon-gift:before { + content: "\f06b"; } -.search-giant { - position: relative; +.icon-leaf:before { + content: "\f06c"; } -.search-giant input { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - font-size: 16px; - padding: 14px 10px; - width: 100%; - height: auto; +.icon-fire:before { + content: "\f06d"; } -.search-giant button { - cursor: pointer; - position: absolute; - right: 15px; - top: 50%; - display: block; - border: none; - padding: 0; - margin-top: -17px; - width: 30px; - height: 30px; - background: transparent url("../../../base/images/icon-search-27x26.png") no-repeat center center; - text-indent: -900em; +.icon-eye-open:before { + content: "\f06e"; } -.control-order-by { - position: absolute; - bottom: -65px; - right: 0; +.icon-eye-close:before { + content: "\f070"; } -.control-order-by label, -.control-order-by select { - display: inline; +.icon-warning-sign:before { + content: "\f071"; } -.control-order-by select { - width: 160px; +.icon-plane:before { + content: "\f072"; } -.resource-list { - margin: 0; - list-style: none; - margin: -10px -10px 10px -10px; +.icon-calendar:before { + content: "\f073"; } -.resource-item { - position: relative; - padding: 10px 110px 10px 60px; - margin-bottom: 0px; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; +.icon-random:before { + content: "\f074"; } -.resource-item:hover { - background-color: #efefef; +.icon-comment:before { + content: "\f075"; } -.resource-item .heading { - color: #000000; - font-size: 14px; - font-weight: bold; +.icon-magnet:before { + content: "\f076"; } -.resource-item .format-label { - position: absolute; - top: 10px; - left: 10px; +.icon-chevron-up:before { + content: "\f077"; } -.resource-item .description { - font-size: 12px; - margin-bottom: 0; +.icon-chevron-down:before { + content: "\f078"; } -.resource-item .btn-group { - position: absolute; - top: 13px; - right: 10px; +.icon-retweet:before { + content: "\f079"; } -.dataset-resource-form .dataset-form-resource-types { - margin-bottom: 5px; +.icon-shopping-cart:before { + content: "\f07a"; } -.dataset-form-resource-types .ckan-icon { - position: relative; - top: 3px; +.icon-folder-close:before { + content: "\f07b"; } -.dataset-form-resource-types .radio { - font-weight: normal; - padding-left: 0; - padding-right: 18px; +.icon-folder-open:before { + content: "\f07c"; } -.dataset-form-resource-types label { - position: relative; +.icon-resize-vertical:before { + content: "\f07d"; } -.dataset-form-resource-types input[type=radio]:checked + label { - font-weight: bold; +.icon-resize-horizontal:before { + content: "\f07e"; } -.dataset-form-resource-types input[type=radio]:checked + label:after { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - width: 16px; - height: 16px; - background-position: -192px 0; - display: block; - content: ""; - position: absolute; - top: auto; - left: 0; - bottom: -12px; +.icon-bar-chart:before { + content: "\f080"; } -.dataset-form-resource-types input[type=radio]:checked + label:after:last-child { - *margin-left: 0; +.icon-twitter-sign:before { + content: "\f081"; } -.dataset-form-resource-types input[type=radio] { - display: none; +.icon-facebook-sign:before { + content: "\f082"; } -.tag-list { - margin: 0; - list-style: none; - padding: 10px; +.icon-camera-retro:before { + content: "\f083"; } -.tag-list li { - display: inline-block; - margin-right: 5px; +.icon-key:before { + content: "\f084"; } -.tag-list li:last-child { - margin-right: 0; +.icon-cogs:before { + content: "\f085"; } -.additional-info td, -.additional-info th { - width: 50%; +.icon-comments:before { + content: "\f086"; } -.label[data-format=html], -.label[data-format*=html] { - background-color: #55a1ce; +.icon-thumbs-up:before { + content: "\f087"; } -.label[data-format=json], -.label[data-format*=json] { - background-color: #ef7100; +.icon-thumbs-down:before { + content: "\f088"; } -.label[data-format=xml], -.label[data-format*=xml] { - background-color: #ef7100; +.icon-star-half:before { + content: "\f089"; } -.label[data-format=text], -.label[data-format*=text] { - background-color: #74cbec; +.icon-heart-empty:before { + content: "\f08a"; } -.label[data-format=csv], -.label[data-format*=csv] { - background-color: #dfb100; +.icon-signout:before { + content: "\f08b"; } -.label[data-format=xls], -.label[data-format*=xls] { - background-color: #2db55d; +.icon-linkedin-sign:before { + content: "\f08c"; } -.label[data-format=zip], -.label[data-format*=zip] { - background-color: #686868; +.icon-pushpin:before { + content: "\f08d"; } -.label[data-format=api], -.label[data-format*=api] { - background-color: #ec96be; +.icon-external-link:before { + content: "\f08e"; } -.label[data-format=pdf], -.label[data-format*=pdf] { - background-color: #e0051e; +.icon-signin:before { + content: "\f090"; } -.label[data-format=rdf], -.label[data-format*=rdf], -.label[data-format*=nquad], -.label[data-format*=ntriples], -.label[data-format*=turtle] { - background-color: #0b4498; +.icon-trophy:before { + content: "\f091"; } -.group .media-vertical .image { - margin: 0 -5px 5px; +.icon-github-sign:before { + content: "\f092"; } -.group-list:nth-child(odd) { - clear: left; +.icon-upload-alt:before { + content: "\f093"; } -.group-list .module-heading { - padding-top: 15px; - padding-bottom: 15px; +.icon-lemon:before { + content: "\f094"; } -.group-list .dataset-content { - min-height: 54px; +.icon-phone:before { + content: "\f095"; } -.group-list .module-heading h3 { - margin-bottom: 2px; +.icon-check-empty:before { + content: "\f096"; } -.group-list .module-heading h3 a { - color: #333333; +.icon-bookmark-empty:before { + content: "\f097"; } -.toolbar { - *zoom: 1; - margin-top: -10px; - margin-bottom: 10px; - padding: 5px 0; +.icon-phone-sign:before { + content: "\f098"; } -.toolbar:before, -.toolbar:after { - display: table; - content: ""; +.icon-twitter:before { + content: "\f099"; } -.toolbar:after { - clear: both; +.icon-facebook:before { + content: "\f09a"; } -.toolbar .breadcrumb { - *zoom: 1; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - position: relative; - float: left; - margin: 0; - padding: 0; - border: none; - background: none; - font-size: 20px; +.icon-github:before { + content: "\f09b"; } -.toolbar .breadcrumb:before, -.toolbar .breadcrumb:after { - display: table; - content: ""; +.icon-unlock:before { + content: "\f09c"; } -.toolbar .breadcrumb:after { - clear: both; +.icon-credit-card:before { + content: "\f09d"; } -.toolbar li [class^=icon]:before { - width: auto; +.icon-rss:before { + content: "\f09e"; } -.toolbar .breadcrumb li:after { - content: " / "; +.icon-hdd:before { + content: "\f0a0"; } -.toolbar .breadcrumb li.active:after { - content: ""; +.icon-bullhorn:before { + content: "\f0a1"; } -.toolbar .breadcrumb li:last-of-type:after { - content: ""; +.icon-bell:before { + content: "\f0a2"; } -.toolbar .home a { - text-decoration: none; +.icon-certificate:before { + content: "\f0a3"; } -.toolbar .home span { - display: none; +.icon-hand-right:before { + content: "\f0a4"; } -.toolbar .breadcrumb a { - color: #505050; - line-height: 28px; +.icon-hand-left:before { + content: "\f0a5"; } -.toolbar .breadcrumb .active a { - font-weight: bold; +.icon-hand-up:before { + content: "\f0a6"; } -.toolbar .actions { - margin: 0; - list-style: none; +.icon-hand-down:before { + content: "\f0a7"; } -.toolbar .actions li { - display: inline-block; - margin-right: 5px; +.icon-circle-arrow-left:before { + content: "\f0a8"; } -.toolbar .actions li { - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; +.icon-circle-arrow-right:before { + content: "\f0a9"; } -.toolbar .actions li:last-of-type { - margin-right: 0; +.icon-circle-arrow-up:before { + content: "\f0aa"; } -.toolbar .btn { - padding: 0 10px 0 8px; - border-color: #b7b7b7; - line-height: 27px; +.icon-circle-arrow-down:before { + content: "\f0ab"; } -.toolbar .btn-success { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(top, #62c462, #51a351); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); - border-color: #51a351 #51a351 #387038; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #51a351; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-globe:before { + content: "\f0ac"; } -.toolbar .btn-success:hover, -.toolbar .btn-success:active, -.toolbar .btn-success.active, -.toolbar .btn-success.disabled, -.toolbar .btn-success[disabled] { - background-color: #51a351; - *background-color: #499249; +.icon-wrench:before { + content: "\f0ad"; } -.toolbar .btn-success:active, -.toolbar .btn-success.active { - background-color: #408140 \9; +.icon-tasks:before { + content: "\f0ae"; } -.toolbar .btn-success .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-filter:before { + content: "\f0b0"; } -.toolbar .btn-primary { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #dd0c0c; - background-image: -moz-linear-gradient(top, #cf0a0a, #f21010); - background-image: -ms-linear-gradient(top, #cf0a0a, #f21010); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cf0a0a), to(#f21010)); - background-image: -webkit-linear-gradient(top, #cf0a0a, #f21010); - background-image: -o-linear-gradient(top, #cf0a0a, #f21010); - background-image: linear-gradient(top, #cf0a0a, #f21010); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cf0a0a', endColorstr='#f21010', GradientType=0); - border-color: #f21010 #f21010 #ac0909; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #f21010; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-briefcase:before { + content: "\f0b1"; } -.toolbar .btn-primary:hover, -.toolbar .btn-primary:active, -.toolbar .btn-primary.active, -.toolbar .btn-primary.disabled, -.toolbar .btn-primary[disabled] { - background-color: #f21010; - *background-color: #dd0c0c; +.icon-fullscreen:before { + content: "\f0b2"; } -.toolbar .btn-primary:active, -.toolbar .btn-primary.active { - background-color: #c40b0b \9; +.icon-group:before { + content: "\f0c0"; } -.toolbar .btn-primary .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-link:before { + content: "\f0c1"; } -.toolbar .btn-warning { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #faa732; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(top, #fbb450, #f89406); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); - border-color: #f89406 #f89406 #ad6704; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #f89406; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-cloud:before { + content: "\f0c2"; } -.toolbar .btn-warning:hover, -.toolbar .btn-warning:active, -.toolbar .btn-warning.active, -.toolbar .btn-warning.disabled, -.toolbar .btn-warning[disabled] { - background-color: #f89406; - *background-color: #df8505; +.icon-beaker:before { + content: "\f0c3"; } -.toolbar .btn-warning:active, -.toolbar .btn-warning.active { - background-color: #c67605 \9; +.icon-cut:before { + content: "\f0c4"; } -.toolbar .btn-warning .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-copy:before { + content: "\f0c5"; } -.toolbar .btn-danger { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #da4f49; - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(top, #ee5f5b, #bd362f); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); - border-color: #bd362f #bd362f #802420; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #bd362f; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-paper-clip:before { + content: "\f0c6"; } -.toolbar .btn-danger:hover, -.toolbar .btn-danger:active, -.toolbar .btn-danger.active, -.toolbar .btn-danger.disabled, -.toolbar .btn-danger[disabled] { - background-color: #bd362f; - *background-color: #a9302a; +.icon-save:before { + content: "\f0c7"; } -.toolbar .btn-danger:active, -.toolbar .btn-danger.active { - background-color: #942a25 \9; +.icon-sign-blank:before { + content: "\f0c8"; } -.toolbar .btn-danger .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-reorder:before { + content: "\f0c9"; } -.toolbar .btn-success { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(top, #62c462, #51a351); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); - border-color: #51a351 #51a351 #387038; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #51a351; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-list-ul:before { + content: "\f0ca"; } -.toolbar .btn-success:hover, -.toolbar .btn-success:active, -.toolbar .btn-success.active, -.toolbar .btn-success.disabled, -.toolbar .btn-success[disabled] { - background-color: #51a351; - *background-color: #499249; +.icon-list-ol:before { + content: "\f0cb"; } -.toolbar .btn-success:active, -.toolbar .btn-success.active { - background-color: #408140 \9; +.icon-strikethrough:before { + content: "\f0cc"; } -.toolbar .btn-success .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-underline:before { + content: "\f0cd"; } -.toolbar .btn-info { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #49afcd; - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); - background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(top, #5bc0de, #2f96b4); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); - border-color: #2f96b4 #2f96b4 #1f6377; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #2f96b4; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-table:before { + content: "\f0ce"; } -.toolbar .btn-info:hover, -.toolbar .btn-info:active, -.toolbar .btn-info.active, -.toolbar .btn-info.disabled, -.toolbar .btn-info[disabled] { - background-color: #2f96b4; - *background-color: #2a85a0; +.icon-magic:before { + content: "\f0d0"; } -.toolbar .btn-info:active, -.toolbar .btn-info.active { - background-color: #24748c \9; +.icon-truck:before { + content: "\f0d1"; } -.toolbar .btn-info .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-pinterest:before { + content: "\f0d2"; } -.toolbar .btn-inverse { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #414141; - background-image: -moz-linear-gradient(top, #555555, #222222); - background-image: -ms-linear-gradient(top, #555555, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); - background-image: -webkit-linear-gradient(top, #555555, #222222); - background-image: -o-linear-gradient(top, #555555, #222222); - background-image: linear-gradient(top, #555555, #222222); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); - border-color: #222222 #222222 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #222222; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-pinterest-sign:before { + content: "\f0d3"; } -.toolbar .btn-inverse:hover, -.toolbar .btn-inverse:active, -.toolbar .btn-inverse.active, -.toolbar .btn-inverse.disabled, -.toolbar .btn-inverse[disabled] { - background-color: #222222; - *background-color: #151515; +.icon-google-plus-sign:before { + content: "\f0d4"; } -.toolbar .btn-inverse:active, -.toolbar .btn-inverse.active { - background-color: #080808 \9; +.icon-google-plus:before { + content: "\f0d5"; } -.toolbar .btn-inverse .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-money:before { + content: "\f0d6"; } -.hide-heading { - display: none; +.icon-caret-down:before { + content: "\f0d7"; } -.page-header { - position: relative; - border-bottom: 1px solid #d0d0d0; - height: 30px; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - background-color: #f3f3f3; - background-image: -moz-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -ms-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f0f0f0)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -o-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: linear-gradient(top, #f5f5f5, #f0f0f0); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f0f0f0', GradientType=0); +.icon-caret-up:before { + content: "\f0d8"; } -.page-header .nav-tabs { - position: absolute; - left: 20px; - bottom: -1px; - margin-bottom: 0; +.icon-caret-left:before { + content: "\f0d9"; } -.page-header .nav-tabs i { - margin-right: 10px; - font-size: 14px; +.icon-caret-right:before { + content: "\f0da"; } -.page-header .nav-tabs a:hover { - background-color: #ffffff; +.icon-columns:before { + content: "\f0db"; } -.prose h1, -.prose heading-1 h2, -.prose heading-2 { - margin-bottom: 15px; +.icon-sort:before { + content: "\f0dc"; } -.prose h3, -.prose heading-3 { - margin-bottom: 10px; +.icon-sort-down:before { + content: "\f0dd"; } -.table-chunky td, -.table-chunky th { - padding: 12px 15px; - font-size: 12px; +.icon-sort-up:before { + content: "\f0de"; } -.table-chunky thead th, -.table-chunky thead td { - color: #ffffff; - background-color: #aaaaaa; - padding-top: 10px; - padding-bottom: 10px; +.icon-envelope-alt:before { + content: "\f0e0"; } -.table-striped tbody tr:nth-child(odd) td, -.table-striped tbody tr:nth-child(odd) th { - background-color: transparent; +.icon-linkedin:before { + content: "\f0e1"; } -.table-striped tbody tr:nth-child(even) td, -.table-striped tbody tr:nth-child(even) th { - background-color: #f2f2f2; +.icon-undo:before { + content: "\f0e2"; } -.table-chunky.table-bordered { - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; +.icon-legal:before { + content: "\f0e3"; } -.table-chunky.table-bordered thead:first-child tr:first-child th:first-child, -.table-chunky.table-bordered tbody:first-child tr:first-child td:first-child { - -webkit-border-top-left-radius: 2px; - -moz-border-radius-topleft: 2px; - border-top-left-radius: 2px; +.icon-dashboard:before { + content: "\f0e4"; } -.table-chunky.table-bordered thead:first-child tr:first-child th:last-child, -.table-chunky.table-bordered tbody:first-child tr:first-child td:last-child { - -webkit-border-top-right-radius: 2px; - -moz-border-radius-topright: 2px; - border-top-right-radius: 2px; +.icon-comment-alt:before { + content: "\f0e5"; } -.table-chunky.table-bordered thead:last-child tr:last-child th:first-child, -.table-chunky.table-bordered tbody:last-child tr:last-child td:first-child { - -webkit-border-radius: 0 0 0 2px; - -moz-border-radius: 0 0 0 2px; - border-radius: 0 0 0 2px; - -webkit-border-bottom-left-radius: 2px; - -moz-border-radius-bottomleft: 2px; - border-bottom-left-radius: 2px; +.icon-comments-alt:before { + content: "\f0e6"; } -.table-chunky.table-bordered thead:last-child tr:last-child th:last-child, -.table-chunky.table-bordered tbody:last-child tr:last-child td:last-child { - -webkit-border-bottom-right-radius: 2px; - -moz-border-radius-bottomright: 2px; - border-bottom-right-radius: 2px; +.icon-bolt:before { + content: "\f0e7"; } -.ckan-icon { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; +.icon-sitemap:before { + content: "\f0e8"; } -.ckan-icon:last-child { - *margin-left: 0; +.icon-umbrella:before { + content: "\f0e9"; } -.ckan-icon-fb { - width: 16px; - height: 16px; - background-position: 0px 0; +.icon-paste:before { + content: "\f0ea"; } -.ckan-icon-gplus { - width: 16px; - height: 16px; - background-position: -16px 0; +.icon-lightbulb:before { + content: "\f0eb"; } -.ckan-icon-twitter { - width: 16px; - height: 16px; - background-position: -32px 0; +.icon-exchange:before { + content: "\f0ec"; } -.ckan-icon-email { - width: 16px; - height: 16px; - background-position: -48px 0; +.icon-cloud-download:before { + content: "\f0ed"; } -.ckan-icon-share { - width: 16px; - height: 16px; - background-position: -64px 0; +.icon-cloud-upload:before { + content: "\f0ee"; } -.ckan-icon-feed { - width: 16px; - height: 16px; - background-position: -80px 0; +.icon-user-md:before { + content: "\f0f0"; } -.ckan-icon-calendar { - width: 16px; - height: 16px; - background-position: -96px 0; +.icon-stethoscope:before { + content: "\f0f1"; } -.ckan-icon-file { - width: 16px; - height: 16px; - background-position: -112px 0; +.icon-suitcase:before { + content: "\f0f2"; } -.ckan-icon-lock { - width: 16px; - height: 16px; - background-position: -128px 0; +.icon-bell-alt:before { + content: "\f0f3"; } -.ckan-icon-link-file { - width: 16px; - height: 16px; - background-position: -144px 0; +.icon-coffee:before { + content: "\f0f4"; } -.ckan-icon-link-plugin { - width: 16px; - height: 16px; - background-position: -160px 0; +.icon-food:before { + content: "\f0f5"; } -.ckan-icon-upload-file { - width: 16px; - height: 16px; - background-position: -176px 0; +.icon-file-alt:before { + content: "\f0f6"; } -.ckan-icon-callout { - width: 16px; - height: 16px; - background-position: -192px 0; +.icon-building:before { + content: "\f0f7"; } -.ckan-icon-circle-cross { - width: 17px; - height: 17px; - background-position: 0px -16px; +.icon-hospital:before { + content: "\f0f8"; } -.ckan-icon-circle-add { - width: 17px; - height: 17px; - background-position: -17px -16px; +.icon-ambulance:before { + content: "\f0f9"; } -.ckan-icon-flame { - width: 17px; - height: 17px; - background-position: -34px -16px; +.icon-medkit:before { + content: "\f0fa"; } -.ckan-icon-search { - width: 17px; - height: 17px; - background-position: -51px -16px; +.icon-fighter-jet:before { + content: "\f0fb"; } -.ckan-icon-large-lock { - width: 20px; - height: 20px; - background-position: 0px -33px; +.icon-beer:before { + content: "\f0fc"; } -.ckan-icon-photo { - width: 20px; - height: 20px; - background-position: -20px -33px; +.icon-h-sign:before { + content: "\f0fd"; } -.ckan-icon-add { - width: 20px; - height: 20px; - background-position: -40px -33px; +.icon-plus-sign-alt:before { + content: "\f0fe"; } -.ckan-icon-home { - width: 20px; - height: 20px; - background-position: -60px -33px; +.icon-double-angle-left:before { + content: "\f100"; } -.ckan-icon-rewind { - width: 20px; - height: 20px; - background-position: -80px -33px; +.icon-double-angle-right:before { + content: "\f101"; } -.ckan-icon-tools { - width: 20px; - height: 20px; - background-position: -100px -33px; +.icon-double-angle-up:before { + content: "\f102"; } -.ckan-icon-flag { - width: 20px; - height: 20px; - background-position: -120px -33px; +.icon-double-angle-down:before { + content: "\f103"; } -.ckan-icon-clipboard { - width: 20px; - height: 20px; - background-position: -140px -33px; +.icon-angle-left:before { + content: "\f104"; } -.ckan-icon-share { - width: 20px; - height: 20px; - background-position: -160px -33px; +.icon-angle-right:before { + content: "\f105"; } -.ckan-icon-info { - width: 20px; - height: 20px; - background-position: -180px -33px; +.icon-angle-up:before { + content: "\f106"; } -.ckan-icon-download { - width: 20px; - height: 20px; - background-position: -200px -33px; +.icon-angle-down:before { + content: "\f107"; } -.ckan-icon-star { - width: 20px; - height: 20px; - background-position: -220px -33px; +.icon-desktop:before { + content: "\f108"; } -.ckan-icon-info-flat { - width: 20px; - height: 20px; - background-position: -240px -33px; +.icon-laptop:before { + content: "\f109"; } -.ckan-icon-tag { - width: 20px; - height: 20px; - background-position: -260px -33px; +.icon-tablet:before { + content: "\f10a"; } -.ckan-icon-plus { - width: 20px; - height: 20px; - background-position: -280px -33px; - width: 16px; +.icon-mobile-phone:before { + content: "\f10b"; } -.ckan-icon-head { - width: 20px; - height: 20px; - background-position: -300px -33px; +.icon-circle-blank:before { + content: "\f10c"; } -.ckan-icon-arrow-e { - width: 20px; - height: 20px; - background-position: -320px -33px; - width: 16px; +.icon-quote-left:before { + content: "\f10d"; } -.ckan-icon-bookmark { - width: 25px; - height: 25px; - background-position: 0px -53px; +.icon-quote-right:before { + content: "\f10e"; } -.format-label { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - text-indent: -900em; - background: url("../../../base/images/sprite-resource-icons.png") no-repeat 0 0; +.icon-spinner:before { + content: "\f110"; } -.format-label:last-child { - *margin-left: 0; +.icon-circle:before { + content: "\f111"; } -.format-label { - width: 32px; - height: 35px; - background-position: 0px -62px; +.icon-reply:before { + content: "\f112"; } -.format-label[data-format=rdf], -.format-label[data-format*=rdf] { - width: 32px; - height: 35px; - background-position: -32px -62px; +.icon-github-alt:before { + content: "\f113"; } -.format-label[data-format=pdf], -.format-label[data-format*=pdf] { - width: 32px; - height: 35px; - background-position: -64px -62px; +.icon-folder-close-alt:before { + content: "\f114"; } -.format-label[data-format=api], -.format-label[data-format*=api] { - width: 32px; - height: 35px; - background-position: -96px -62px; +.icon-folder-open-alt:before { + content: "\f115"; } -.format-label[data-format=zip], -.format-label[data-format*=zip] { - width: 32px; - height: 35px; - background-position: -128px -62px; +[class^="icon-"], +[class*=" icon-"] { + display: inline-block; + text-align: right; + font-size: 14px; + line-height: 1; + width: 14px; } -.format-label[data-format=xls], -.format-label[data-format*=xls] { - width: 32px; - height: 35px; - background-position: -160px -62px; +.btn [class^="icon-"], +.nav [class^="icon-"], +.module-heading [class^="icon-"], +.dropdown [class^="icon-"], +.btn [class*=" icon-"], +.nav [class*=" icon-"], +.module-heading [class*=" icon-"], +.dropdown [class*=" icon-"] { + margin-right: 4px; } -.format-label[data-format=csv], -.format-label[data-format*=csv] { - width: 32px; - height: 35px; - background-position: -192px -62px; +.info-block [class^="icon-"], +.info-block [class*=" icon-"] { + float: left; + font-size: 28px; + width: 28px; + margin-right: 5px; + margin-top: 2px; } -.format-label[data-format=txt], -.format-label[data-format*=txt] { - width: 32px; - height: 35px; - background-position: -224px -62px; +.breadcrumb .home .icon-home { + font-size: 24px; + width: 24px; + vertical-align: -1px; } -.format-label[data-format=xml], -.format-label[data-format*=xml] { - width: 32px; - height: 35px; - background-position: -256px -62px; +.info-block-small [class^="icon-"], +.info-block-small [class*=" icon-"] { + font-size: 14px; + width: 14px; + margin-top: 1px; } -.format-label[data-format=json], -.format-label[data-format*=json] { - width: 32px; - height: 35px; - background-position: -288px -62px; +.wrapper { + *zoom: 1; + background-color: #FFF; + border: 1px solid #cccccc; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + position: relative; + background: #ffffff url("../../../base/images/nav.png") 0 0 repeat-y; + margin-bottom: 20px; } -.format-label[data-format=html], -.format-label[data-format*=html] { - width: 32px; - height: 35px; - background-position: -320px -62px; +.wrapper:before, +.wrapper:after { + display: table; + content: ""; + line-height: 0; } -li [class^="icon-"], -li [class*=" icon-"] { - width: auto; +.wrapper:after { + clear: both; } -li .icon-large:before, -li .icon-large:before { - width: auto; +.wrapper.no-nav { + background-image: none; } [role=main], .main { position: relative; - padding-top: 27px; - padding-bottom: 27px; - background-color: #efefef; + padding-top: 10px; + padding-bottom: 20px; + background: #eeeeee url("../../../base/images/bg.png"); } [role=main] { min-height: 350px; } .main:after, -.main:before, -[role=main]:after, -[role=main]:before { - content: ""; - position: absolute; - left: 0; - right: 0; - height: 7px; - background: #ffffff; - border-color: #c9c9c9; - border-style: solid; - border-width: 0; -} -.main:before, -[role=main]:before { - top: 0; - border-bottom-width: 1px; -} -.main:after, [role=main]:after { bottom: 0; border-top-width: 1px; } [role=main] .primary { - float: left; - margin-left: 20px; - width: 700px; + width: 717px; float: right; } [role=main] .secondary { - float: left; margin-left: 20px; width: 220px; margin-left: 0; float: left; } -.primary > :last-child, -.secondary > :last-child { - margin-bottom: 0; +.primary > :last-child, +.secondary > :last-child { + margin-bottom: 0; +} +.primary .primary { + float: left; + width: 467px; + margin-left: 0; + margin-bottom: 20px; +} +.primary .primary h1:first-child, +.primary .primary h2:first-child, +.primary .primary h3:first-child, +.primary .primary h4:first-child { + margin-top: 0; +} +.primary .tertiary { + float: left; + width: 180px; + margin-left: 20px; + margin-bottom: 20px; +} +.hero { + background: url("../../../base/images/background-tile.png"); +} +.hero:after { + background-color: rgba(0, 0, 0, 0.09); + background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: -ms-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0.15)), to(rgba(0, 0, 0, 0))); + background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-repeat: repeat-x; + background-color: #f6f6f6; + border-bottom: 1px solid #d0d0d0; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; + -webkit-box-shadow: inset 0 -4px 0 rgba(0, 0, 0, 0.03); + -moz-box-shadow: inset 0 -4px 0 rgba(0, 0, 0, 0.03); + box-shadow: inset 0 -4px 0 rgba(0, 0, 0, 0.03); +} +.hero:after .back:hover { + text-decoration: none; +} +.hero:after .back:hover span { + text-decoration: underline; +} +.context-info .module-content { + padding: 15px; +} +.context-info .image { + margin-bottom: 10px; +} +.context-info .image img, +.context-info .image a { + display: block; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.context-info p { + overflow: auto; +} +.context-info code { + display: block; + font-weight: normal; + padding: 0; + margin: 0; + overflow: auto; +} +.context-info h1.heading { + margin: 0 0 5px 0; + font-size: 18px; + line-height: 1.3; +} +.context-info .info { + margin-top: 15px; + padding-top: 10px; + border-top: 1px dotted #DDD; +} +.context-info .info dl dd { + margin-top: 3px; + margin-left: 0; +} +.context-info .nums { + *zoom: 1; + margin-top: 15px; + padding-top: 10px; + padding-bottom: 0; + border-top: 1px dotted #DDD; +} +.context-info .nums:before, +.context-info .nums:after { + display: table; + content: ""; + line-height: 0; +} +.context-info .nums:after { + clear: both; +} +.context-info .nums dl { + float: left; + width: 50%; + margin: 5px 0 0 0; + color: #444444; +} +.context-info .nums dl dt { + display: block; + font-size: 13px; + font-weight: 300; +} +.context-info .nums dl dd { + display: block; + font-size: 30px; + font-weight: 700; + line-height: 36px; + margin-left: 0; +} +.context-info .nums dl dd .smallest { + font-size: 13px; +} +.context-info .nums dl dd .smaller { + font-size: 16px; +} +.context-info .nums dl dd .small { + font-size: 21px; } -.hero { - background: url("../../../base/images/background-tile.png"); +.context-info .follow_button { + margin-top: 15px; } -.hero:after { - background-color: rgba(0, 0, 0, 0.09); - background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: -ms-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0.15)), to(rgba(0, 0, 0, 0))); - background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-repeat: repeat-x; - background-color: transparent; - top: 7px; - bottom: auto; - height: 5px; +.context-info.editing .module-content { + margin-top: 0; } .hero { - padding-bottom: 0; + background: url("../../../base/images/background-tile.png"); + padding: 20px 0; min-height: 0; } .hero > .container { position: relative; padding-bottom: 0; } -.hero-primary, -.hero-secondary { - float: left; - margin-left: 20px; - width: 460px; -} -.hero-primary { - margin-left: 0; -} -.hero-primary { - margin-left: 0; - margin-bottom: 0; -} -.hero-secondary { - position: absolute; - bottom: 0; - right: 0; -} -.hero-secondary-inner { - bottom: 0; - left: 0; - right: 0; -} -.hero .module-popup { - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - margin-top: 50px; +.hero .search-giant { + margin-bottom: 10px; } -.hero .module-popup .module-content { - padding-bottom: 2px; +.hero .search-giant input { + border-color: #003f52; } .hero .page-heading { font-size: 18px; @@ -6734,290 +7984,339 @@ li .icon-large:before { } .hero .module-dark { padding: 5px; - margin-bottom: 10px; + margin-bottom: 0; color: #ffffff; background: #ffffff; } .hero .module-dark .module-content { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; background-color: #810606; + border-bottom: none; } .hero .module-dark .module-content .heading { + margin-top: 0; margin-bottom: 7px; + font-size: 24px; + line-height: 40px; } .hero .tags { - margin-bottom: 9px; -} -.hero .tags .tag, -.hero .tags .tag-list { - display: inline-block; -} -.hero .tags .tag-list { - padding: 0; -} -.hero .tags .tag { - margin-right: 15px; -} -header.masthead { *zoom: 1; - color: #ffffff; - padding: 5px 10px 3px; - height: 55px; - background-color: #910707; - background-image: -moz-linear-gradient(top, #810606, #a80808); - background-image: -ms-linear-gradient(top, #810606, #a80808); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#810606), to(#a80808)); - background-image: -webkit-linear-gradient(top, #810606, #a80808); - background-image: -o-linear-gradient(top, #810606, #a80808); - background-image: linear-gradient(top, #810606, #a80808); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#810606', endColorstr='#a80808', GradientType=0); + padding: 5px 10px 10px 10px; + background-color: #500404; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; } -header.masthead:before, -header.masthead:after { +.hero .tags:before, +.hero .tags:after { display: table; content: ""; + line-height: 0; } -header.masthead:after { +.hero .tags:after { clear: both; } -header.masthead .container { - position: relative; +.hero .tags h3, +.hero .tags .tag { + display: block; + float: left; + margin: 5px 10px 0 0; } -header.masthead a { - color: #ffffff; +.hero .tags h3 { + font-size: 14px; + line-height: 20px; + padding: 2px 8px; } -header.masthead hgroup h1, -header.masthead hgroup h2 { +.hero-primary, +.hero-secondary { float: left; - font-size: 34px; - line-height: 1.5; -} -header.masthead hgroup h1 { - font-weight: 900; - letter-spacing: -1px; + margin-left: 20px; + width: 460px; } -header.masthead hgroup h2 { - position: absolute; - bottom: -3px; - left: 0; - margin: 0; - font-size: 15px; - font-weight: normal; - line-height: 1.2; - white-space: nowrap; +.hero-primary { + margin-left: 0; + margin-bottom: 0; } -header.masthead .content { +.hero-secondary { position: absolute; - top: 10px; + bottom: 0; right: 0; } -header.masthead .section { - float: left; +.hero-secondary .hero-secondary-inner { + bottom: 0; + left: 0; + right: 0; } -header.masthead .navigation { - margin-right: 20px; +.main.homepage { + padding-top: 20px; + padding-bottom: 20px; + border-top: 1px solid #cccccc; } -header.masthead .navigation ul.unstyled { - *zoom: 1; - margin: 5px 0; +.main.homepage .module-heading .media-image { + margin-right: 15px; + max-height: 53px; + -webkit-box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.5); + -moz-box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.5); + box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.5); } -header.masthead .navigation ul.unstyled:before, -header.masthead .navigation ul.unstyled:after { - display: table; - content: ""; +.main.homepage .group-listing .box { + min-height: 275px; } -header.masthead .navigation ul.unstyled:after { - clear: both; +.main.homepage .group-list { + margin-bottom: 0; } -header.masthead .navigation ul.unstyled li { - display: block; - float: left; +.main.homepage .group-list .dataset-content { + min-height: 70px; } -header.masthead .navigation ul.unstyled li a { - display: block; - font-size: 12px; - font-weight: bold; - padding: 4px 10px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; +.main.homepage .box .module { + margin-top: 0; } -header.masthead .navigation ul.unstyled li a.active { - background-color: #871212; - box-shadow: 0 -1px 0 #5a0c0c, 0 1px 0 #942b2b; +.account-masthead { + *zoom: 1; + min-height: 30px; + color: #ffffff; + background: #500404 url("../../../base/images/bg.png"); } -header.masthead .site-search { - margin: 3px 0; +.account-masthead:before, +.account-masthead:after { + display: table; + content: ""; + line-height: 0; } -header.masthead .site-search input { - width: 190px; - font-size: 11px; - padding: 4px; +.account-masthead:after { + clear: both; } -header.masthead .account { - background: #900707; - padding: 3px 5px; - margin: 2px 0 2px 30px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 2px 4px #770606; - -moz-box-shadow: inset 0 2px 4px #770606; - box-shadow: inset 0 2px 4px #770606; +.account-masthead .account { + float: right; } -header.masthead .account ul.unstyled { +.account-masthead .account ul { *zoom: 1; } -header.masthead .account ul.unstyled:before, -header.masthead .account ul.unstyled:after { +.account-masthead .account ul:before, +.account-masthead .account ul:after { display: table; content: ""; + line-height: 0; } -header.masthead .account ul.unstyled:after { +.account-masthead .account ul:after { clear: both; } -header.masthead .account ul.unstyled li { +.account-masthead .account ul li { display: block; float: left; + border-left: 1px solid #380303; } -header.masthead .account ul.unstyled li a { +.account-masthead .account ul li a { display: block; - font-size: 12px; + color: #e0c1c1; + font-size: 13px; font-weight: bold; - padding: 4px 10px; + padding: 0 10px; + line-height: 31px; +} +.account-masthead .account ul li a span.username { + margin: 0 2px 0 4px; +} +.account-masthead .account ul li a:hover { + color: #ecdada; + background-color: #380303; + text-decoration: none; } -header.masthead .account ul.unstyled li a.sub { +.account-masthead .account ul li a.sub { font-weight: 300; - border-left: 1px solid #770606; } -header.masthead .account .dropdown { - float: left; +.account-masthead .account ul li a .btn { + vertical-align: 1px; + margin-left: 3px; } -header.masthead .account .button { - display: block; - text-decoration: none; - background-color: #810606; - color: #c08383; - text-shadow: 0 1px 1px #500404; +.account-masthead .account .notifications a span { + font-size: 12px; + margin-left: 3px; + padding: 1px 6px; + background-color: #380303; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 #990707; - -moz-box-shadow: inset 0 1px 0 #990707; - box-shadow: inset 0 1px 0 #990707; } -header.masthead .account .image { - margin: 2px 0; - padding: 0 4px 0 0; - overflow: hidden; - font-size: 10px; +.account-masthead .account .notifications a:hover span { + color: #ffffff; + background-color: #200101; +} +.account-masthead .account .notifications.notifications-important a span { + color: #ffffff; + background-color: #c9403a; +} +.account-masthead .account.authed .image { + padding: 0 6px; +} +.account-masthead .account.authed .image img { + vertical-align: -6px; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; } -header.masthead .account .image i { - vertical-align: -1px; +.masthead { + *zoom: 1; + min-height: 55px; + color: #ffffff; + background: #810606 url("../../../base/images/bg.png"); } -header.masthead .account .image img { - opacity: 0.7; - border-right: 1px solid #a80808; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; +.masthead:before, +.masthead:after { + display: table; + content: ""; + line-height: 0; +} +.masthead:after { + clear: both; } -header.masthead .account .notifications { - padding: 4px 8px 3px 8px; - margin: 2px 5px 2px 0; +.masthead .container { + position: relative; } -header.masthead .account .notifications.notifications-important { +.masthead a { color: #ffffff; - background-color: #c9403a; - text-shadow: 0 1px 1px #a3322d; - -webkit-box-shadow: inset 0 1px 0 #ce534e; - -moz-box-shadow: inset 0 1px 0 #ce534e; - box-shadow: inset 0 1px 0 #ce534e; } -header.masthead .account .dropdown.open .image img, -header.masthead .account .dropdown .image:hover img { - opacity: 1; - border-right-color: #d90a0a; +.masthead hgroup h1, +.masthead hgroup h2 { + float: left; + font-size: 30px; + line-height: 1.5; } -header.masthead .account .dropdown.open .button, -header.masthead .account .dropdown .button:hover { - color: #ffffff; - background-color: #b36a6a; - -webkit-box-shadow: inset 0 1px 0 #c08383; - -moz-box-shadow: inset 0 1px 0 #c08383; - box-shadow: inset 0 1px 0 #c08383; - text-decoration: none; +.masthead hgroup h1 { + font-weight: 900; + letter-spacing: -1px; + margin: 3px 0; +} +.masthead hgroup h2 { + position: absolute; + bottom: -3px; + left: 0; + margin: 0; + font-size: 15px; + font-weight: normal; + line-height: 1.2; + white-space: nowrap; +} +.masthead .content { + position: absolute; + top: 10px; + right: 0; } -header.masthead .account .dropdown.open .notifications-important, -header.masthead .account .dropdown .notifications-important:hover { - background-color: #d46762; - text-shadow: 0 1px 1px #c9403a; - -webkit-box-shadow: inset 0 1px 0 #d97a76; - -moz-box-shadow: inset 0 1px 0 #d97a76; - box-shadow: inset 0 1px 0 #d97a76; +.masthead .section { + float: left; } -header.masthead .account.authed { - margin: 0 0 0 30px; +.masthead input[type="text"] { + border-color: #690505; } -header.masthead .account.not-authed { - padding-top: 2px; - padding-bottom: 2px; +.masthead .navigation { + margin-right: 20px; } -header.masthead .dropdown-menu { - margin-top: -1px; +.masthead .navigation .nav-pills { + margin-bottom: 0; } -header.masthead .user-dropdown-menu a { - color: #810606; +.masthead .navigation .nav-pills li a:hover, +.masthead .navigation .nav-pills li.active a { + background-color: #500404; } -header.masthead .user-dropdown-menu a:hover { - color: #ffffff; +.masthead .site-search { + margin: 2px 8px 2px 0; +} +.masthead .site-search input { + width: 200px; + padding: 4px 10px; } -header.masthead .debug { +.masthead .debug { position: absolute; - bottom: 10px; + top: 37px; left: 10px; - font-size: 11px; color: rgba(255, 255, 255, 0.5); - line-height: 1.2; } .site-footer { *zoom: 1; + min-height: 55px; color: #ffffff; - padding: 5px 10px 3px; - height: 55px; - background-color: #910707; - background-image: -moz-linear-gradient(top, #810606, #a80808); - background-image: -ms-linear-gradient(top, #810606, #a80808); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#810606), to(#a80808)); - background-image: -webkit-linear-gradient(top, #810606, #a80808); - background-image: -o-linear-gradient(top, #810606, #a80808); - background-image: linear-gradient(top, #810606, #a80808); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#810606', endColorstr='#a80808', GradientType=0); - font-size: 12px; + background: #810606 url("../../../base/images/bg.png"); padding: 20px 0; } .site-footer:before, .site-footer:after { display: table; content: ""; + line-height: 0; } .site-footer:after { clear: both; } +.site-footer .container { + position: relative; +} +.site-footer a { + color: #ffffff; +} +.site-footer hgroup h1, +.site-footer hgroup h2 { + float: left; + font-size: 30px; + line-height: 1.5; +} +.site-footer hgroup h1 { + font-weight: 900; + letter-spacing: -1px; + margin: 3px 0; +} +.site-footer hgroup h2 { + position: absolute; + bottom: -3px; + left: 0; + margin: 0; + font-size: 15px; + font-weight: normal; + line-height: 1.2; + white-space: nowrap; +} +.site-footer .content { + position: absolute; + top: 10px; + right: 0; +} +.site-footer .section { + float: left; +} +.site-footer input[type="text"] { + border-color: #690505; +} +.site-footer .navigation { + margin-right: 20px; +} +.site-footer .navigation .nav-pills { + margin-bottom: 0; +} +.site-footer .navigation .nav-pills li a:hover, +.site-footer .navigation .nav-pills li.active a { + background-color: #500404; +} +.site-footer .site-search { + margin: 2px 8px 2px 0; +} +.site-footer .site-search input { + width: 200px; + padding: 4px 10px; +} +.site-footer .debug { + position: absolute; + top: 37px; + left: 10px; + color: rgba(255, 255, 255, 0.5); +} .site-footer, .site-footer label, .site-footer small { - color: #ccdee3; + color: #cd9b9b; } .site-footer a { - color: #ccdee3; + color: #cd9b9b; } .footer-links, .attribution { @@ -7028,19 +8327,24 @@ header.masthead .debug { .footer-links { margin-left: 0; } -.footer-links li { - display: inline-block; - width: 40%; - margin-right: 5%; +.footer-links ul { + float: left; + margin-left: 20px; + width: 220px; +} +.footer-links ul:first-child { + margin-left: 0; +} +.footer-links ul li { margin-bottom: 5px; } .attribution small { - color: #ccdee3; + color: #cd9b9b; font-size: 12px; } .attribution .ckan-footer-logo { display: block; - width: 65px; + width: 68px; height: 21px; margin-top: 2px; background: url("../../../base/images/ckan-logo-footer.png") no-repeat top left; @@ -7053,6 +8357,7 @@ header.masthead .debug { .lang-select:after { display: table; content: ""; + line-height: 0; } .lang-select:after { clear: both; @@ -7069,153 +8374,66 @@ header.masthead .debug { .lang-dropdown li { width: auto; } -.lang-dropdown .select2-result-label[data-value]:before { - content: ""; - display: inline-block; - background-image: url("../../../base/images/flags.png"); - background-repeat: no-repeat; - background-position: 0 11px; - width: 17px; - height: 11px; - position: relative; - top: 1px; -} -.lang-dropdown .select2-result-label[data-value*="/en/"]:before { - background-position: 0 0; -} -.lang-dropdown .select2-result-label[data-value*="/de/"]:before { - background-position: 0 -11px; -} -.lang-dropdown .select2-result-label[data-value*="/fr/"]:before { - background-position: 0 -22px; -} -.lang-dropdown .select2-result-label[data-value*="/it/"]:before { - background-position: 0 -33px; -} -.lang-dropdown .select2-result-label[data-value*="/es/"]:before { - background-position: 0 -44px; -} -.lang-dropdown .select2-result-label[data-value*="/pl/"]:before { - background-position: 0 -55px; +.table-selected td { + background-color: #f5f5f5; } -.lang-dropdown .select2-result-label[data-value*="/ru/"]:before { - background-position: 0 -66px; +.table-selected td .edit { + display: block; } -.lang-dropdown .select2-result-label[data-value*="/nl/"]:before { - background-position: 0 -77px; +.table-bulk-edit th input { + top: -5px; } -.lang-dropdown .select2-result-label[data-value*="/sv/"]:before { - background-position: 0 -88px; +.table-bulk-edit .table-actions .btn-group { + float: left; + margin: 0 10px 0 0; } -.lang-dropdown .select2-result-label[data-value*="/no/"]:before { - background-position: 0 -99px; +.table-bulk-edit .context p { + margin-bottom: 0; } -.lang-dropdown .select2-result-label[data-value*="/cs/"]:before, -.lang-dropdown .select2-result-label[data-value*="/cs_CZ/"]:before { - background-position: 0 -110px; +.table-header thead th { + background-color: #f6f6f6; } -.lang-dropdown .select2-result-label[data-value*="/hu/"]:before { - background-position: 0 -121px; +.table-edit-hover .edit { + display: none; + float: right; } -.lang-dropdown .select2-result-label[data-value*="/pt_BR/"]:before { - background-position: 0 -132px; +.table-edit-hover tr:hover .edit { + display: block; } -.lang-dropdown .select2-result-label[data-value*="/fi/"]:before { - background-position: 0 -143px; +.js .table-toggle-more .toggle-more { + display: none; } -.lang-dropdown .select2-result-label[data-value*="/bg/"]:before { - background-position: 0 -154px; +.js .table-toggle-more .show-more { + display: inline; } -.lang-dropdown .select2-result-label[data-value*="/ca/"]:before { - background-position: 0 -165px; +.js .table-toggle-more .show-less { + display: none; } -.lang-dropdown .select2-result-label[data-value*="/sq/"]:before { - background-position: 0 -176px; +.js .table-toggle-more .toggle-seperator { + display: table-row; } -.lang-dropdown .select2-result-label[data-value*="/sr/"]:before, -.lang-dropdown .select2-result-label[data-value*="/sr_Latn/"]:before { - background-position: 0 -187px; +.js .table-toggle-more .toggle-seperator td { + height: 11px; + padding: 0; + background-image: url("../../../base/images/table-seperator.png"); } -.lang-dropdown .select2-result-label[data-value*="/zh_TW/"]:before { - background-position: 0 -198px; +.js .table .toggle-show td { + background: none; + text-align: center; } -.lang-dropdown .select2-result-label[data-value*="/lv/"]:before { - background-position: 0 -209px; +.js .table-toggle-less .show-less { + display: inline; } -.lang-dropdown .select2-result-label[data-value*="/sk/"]:before { - background-position: 0 -220px; +.js .table-toggle-less .show-more { + display: none; } -.lang-dropdown .select2-result-label[data-value*="/pt_BR/"]:before { - background-position: 0 -132px; +.js .table-toggle-less .toggle-seperator { + display: none; } .profile .empty, .profile .dataset-list { margin-bottom: 20px; } -.profile-info .module-content { - padding: 15px; -} -.profile-info .avatar { - border: 1px solid #DDD; - padding: 5px; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; -} -.profile-info .avatar img, -.profile-info .avatar a { - display: block; -} -.profile-info code { - font-weight: normal; - padding: 0; - margin: 0; -} -.profile-info h1.heading { - margin: 10px 0 5px 0; - font-size: 21px; -} -.profile-info .info { - margin-top: 15px; - padding-top: 10px; - border-top: 1px dotted #DDD; -} -.profile-info .info dl dd { - margin-top: 3px; - margin-left: 0; -} -.profile-info .nums { - *zoom: 1; - margin-top: 15px; - padding-top: 10px; - padding-bottom: 0; - border-top: 1px dotted #DDD; -} -.profile-info .nums:before, -.profile-info .nums:after { - display: table; - content: ""; -} -.profile-info .nums:after { - clear: both; -} -.profile-info .nums dl { - float: left; - width: 33%; - margin: 5px 0 0 0; - color: #4d4d4d; -} -.profile-info .nums dl dt { - display: block; - font-weight: 300; -} -.profile-info .nums dl dd { - display: block; - font-size: 30px; - font-weight: 700; - line-height: 1.2; - margin-left: 0; -} .activity { margin: 10px 0; padding: 0; @@ -7232,13 +8450,16 @@ header.masthead .debug { .activity .item:after { display: table; content: ""; + line-height: 0; } .activity .item:after { clear: both; } -.activity .item i { +.activity .item .icon { display: block; - float: left; + position: absolute; + top: 0; + left: 0; width: 30px; height: 30px; line-height: 30px; @@ -7246,7 +8467,6 @@ header.masthead .debug { color: #ffffff; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); font-weight: normal; - font-size: 16px; margin-right: 10px; -webkit-border-radius: 100px; -moz-border-radius: 100px; @@ -7261,20 +8481,19 @@ header.masthead .debug { border-radius: 100px; } .activity .item .actor .gravatar { - float: left; - margin-top: -5px; - margin-right: 10px; + position: absolute; + top: 0; + left: 40px; } .activity .item p { font-size: 14px; line-height: 1.5; - margin: 5px 0 0 0; + margin: 5px 0 0 80px; } .activity .item .date { color: #999; font-size: 12px; white-space: nowrap; - margin-left: 5px; } .activity .item .new { display: block; @@ -7294,106 +8513,278 @@ header.masthead .debug { -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } -.popover .about { - margin-bottom: 10px; +.activity .load-less { + margin-bottom: 15px; +} +.popover { + width: 300px; +} +.popover .popover-title { + font-weight: bold; + margin-bottom: 0; +} +.popover p.about { + margin: 0 0 10px 0; } .popover .popover-close { float: right; text-decoration: none; } -.activity .item i { - background-color: #767dce; +.activity .item .icon { + background-color: #999999; } -.activity .item.added-tag i { +.activity .item.added-tag .icon { background-color: #6995a6; } -.activity .item.changed-group i { +.activity .item.changed-group .icon { background-color: #767dce; } -.activity .item.changed-package i { +.activity .item.changed-package .icon { background-color: #8c76ce; } -.activity .item.changed-package_extra i { +.activity .item.changed-package_extra .icon { background-color: #769ace; } -.activity .item.changed-resource i { +.activity .item.changed-resource .icon { background-color: #aa76ce; } -.activity .item.changed-user i { +.activity .item.changed-user .icon { background-color: #76b8ce; } -.activity .item.deleted-group i { +.activity .item.changed-organization .icon { + background-color: #699fa6; +} +.activity .item.deleted-group .icon { background-color: #b95252; } -.activity .item.deleted-package i { +.activity .item.deleted-package .icon { background-color: #b97452; } -.activity .item.deleted-package_extra i { +.activity .item.deleted-package_extra .icon { background-color: #b95274; } -.activity .item.deleted-resource i { +.activity .item.deleted-resource .icon { background-color: #b99752; } -.activity .item.new-group i { +.activity .item.deleted-organization .icon { + background-color: #b95297; +} +.activity .item.new-group .icon { background-color: #69a67a; } -.activity .item.new-package i { +.activity .item.new-package .icon { background-color: #69a68e; } -.activity .item.new-package_extra i { +.activity .item.new-package_extra .icon { background-color: #6ca669; } -.activity .item.new-resource i { +.activity .item.new-resource .icon { background-color: #81a669; } -.activity .item.new-user i { +.activity .item.new-user .icon { background-color: #69a6a3; } -.activity .item.removed-tag i { +.activity .item.new-organization .icon { + background-color: #81a669; +} +.activity .item.removed-tag .icon { background-color: #b95297; } -.activity .item.deleted-related-item i { +.activity .item.deleted-related-item .icon { background-color: #b9b952; } -.activity .item.follow-dataset i { +.activity .item.follow-dataset .icon { background-color: #767dce; } -.activity .item.follow-user i { +.activity .item.follow-user .icon { background-color: #8c76ce; } -.activity .item.new-related-item i { +.activity .item.new-related-item .icon { background-color: #95a669; } -.activity .item.follow-group i { +.activity .item.follow-group .icon { background-color: #8ba669; } -.popover-context-loading .popover-title { +.dropdown:hover .dropdown-menu { + display: block; +} +.js .dropdown .dropdown-menu, +.js .dropdown:hover .dropdown-menu { + display: none; +} +.js .dropdown.open .dropdown-menu { + display: block; +} +#followee-filter .btn { + *zoom: 1; +} +#followee-filter .btn:before, +#followee-filter .btn:after { + display: table; + content: ""; + line-height: 0; +} +#followee-filter .btn:after { + clear: both; +} +#followee-filter .btn span, +#followee-filter .btn strong { + display: block; + float: left; + line-height: 1.5; +} +#followee-filter .btn span { + font-weight: normal; +} +#followee-filter .btn strong { + margin: 0 5px; + white-space: nowrap; + max-width: 90px; + overflow: hidden; + text-overflow: ellipsis; +} +.dashboard-context { + position: relative; + margin-bottom: 20px; + padding: 20px; + border-bottom: 1px solid #DCDCDC; + background-color: #f6f6f6; + -webkit-border-radius: 3px 0 0 0; + -moz-border-radius: 3px 0 0 0; + border-radius: 3px 0 0 0; +} +.dashboard-context h2 { + margin-bottom: 10px; +} +.dashboard-context .arrow { + position: absolute; + content: ' '; + top: 30px; + right: -10px; + width: 10px; + height: 21px; + background: transparent url("../../../base/images/dashboard-followee-related.png"); +} +.popover-followee .popover-title { display: none; } -.popover-context-loading .popover-content { +.popover-followee .popover-content { + padding: 0; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } -.popover-context-loading .popover-content img { - vertical-align: -3px; - margin-right: 10px; +.popover-followee .empty { + padding: 10px; } -.follower-list li { - margin: 0 0 15px 0; +.popover-followee .popover-header { + *zoom: 1; + background-color: whiteSmoke; + padding: 5px; + border-bottom: 1px solid #cccccc; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } -.follower-list .gravatar { - vertical-align: -4px; - margin-right: 3px; +.popover-followee .popover-header:before, +.popover-followee .popover-header:after { + display: table; + content: ""; + line-height: 0; +} +.popover-followee .popover-header:after { + clear: both; +} +.popover-followee .popover-header .input-prepend { + margin-bottom: 0; +} +.popover-followee .popover-header .add-on, +.popover-followee .popover-header input { + float: left; + margin: 0; +} +.popover-followee .popover-header .add-on { + padding: 4px 8px 4px 12px; + border-right-width: 0; + -webkit-border-radius: 100px 0 0 100px; + -moz-border-radius: 100px 0 0 100px; + border-radius: 100px 0 0 100px; +} +.popover-followee .popover-header input { + padding: 4px 12px 4px 8px; + font-size: 13px; + width: 207px; + -webkit-border-radius: 0 100px 100px 0; + -moz-border-radius: 0 100px 100px 0; + border-radius: 0 100px 100px 0; +} +.popover-followee .nav { + padding: 0; + margin: 0; + max-height: 205px; + overflow: auto; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; +} +.popover-followee .nav li a { + display: block; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + padding: 7px 10px 7px 15px; + margin: 0; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.popover-followee .nav li a i { + background-color: #810606; + color: #ffffff; + margin-right: 11px; + padding: 3px 5px; + line-height: 1; -webkit-border-radius: 100px; -moz-border-radius: 100px; border-radius: 100px; + -webkit-box-shadow: inset 0 1px 2x rgba(0, 0, 0, 0.2); + -moz-box-shadow: inset 0 1px 2x rgba(0, 0, 0, 0.2); + box-shadow: inset 0 1px 2x rgba(0, 0, 0, 0.2); } -.module-my-datasets .empty { - padding: 10px; +.popover-followee .nav li a:hover i { + background-color: #000; +} +.popover-followee .nav li.active a i { + color: #810606; + background-color: #ffffff; +} +.dashboard-me { + *zoom: 1; + padding: 15px 15px 0 15px; +} +.dashboard-me:before, +.dashboard-me:after { + display: table; + content: ""; + line-height: 0; +} +.dashboard-me:after { + clear: both; +} +.dashboard-me img { + float: left; + margin-right: 10px; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; +} +.dashboard-me strong { + display: block; + font-size: 16px; + margin: 3px 0; } body { - background-color: #a80808; + background: #810606 url("../../../base/images/bg.png"); } [hidden] { display: none; @@ -7412,11 +8803,10 @@ table .metric { width: 140px; } code { - padding: 2px 2px; color: #000000; - font-weight: bold; border: none; background: none; + white-space: normal; } pre { border: none; @@ -7446,10 +8836,11 @@ iframe { text-indent: -999em; } .empty { - color: #aeaeae; + color: #aaaaaa; font-style: italic; } .page-heading { + margin-top: 0; margin-bottom: 16px; } .m-top { @@ -7492,10 +8883,6 @@ iframe { position: relative; top: -20px; } -.ie .module, -.ie .media-image { - border: 1px solid #cccccc; -} .ie .module-popup { border-bottom: none; } @@ -7519,24 +8906,19 @@ iframe { .ie9 .control-large input { height: 56px; } -.ie9 .module { - -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); - box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); +.ie8 .account-masthead a.image, +.ie8 .account-masthead .username { + white-space: nowrap; } -.ie7 .masthead nav ul li a.active, -.ie8 .masthead nav ul li a.active { - position: relative; - top: -1px; - background-color: #8b0606; - border-top: 1px solid #720505; - border-bottom: 1px solid #990707; +.ie9 .homepage .media.module-heading .media-image img, +.ie8 .homepage .media.module-heading .media-image img, +.ie7 .homepage .media.module-heading .media-image img { + width: 85px !important; } -.ie8 .masthead .account a.image { - display: block; - width: 25px; - padding-right: 10px; - white-space: nowrap; +.ie8 .hero .hero-primary.module-popup .box, +.ie7 .hero .hero-primary.module-popup .box { + padding-bottom: 20px !important; + margin-bottom: 0 !important; } .ie7 .alert { position: relative; @@ -7556,6 +8938,7 @@ iframe { .ie7 .tags .tag-list:after { display: table; content: ""; + line-height: 0; } .ie7 .tags .tag-list:after { clear: both; @@ -7569,8 +8952,6 @@ iframe { } .ie7 .tags .tag { display: block; - border: 1px solid #d0d0d0; - background: #f5f5f5; } .ie7 .search-giant input { width: 95%; @@ -7621,6 +9002,9 @@ iframe { .ie7 .stages li .highlight { width: auto; } +.ie7 .account-masthead .account a i { + line-height: 31px; +} .ie7 .masthead { position: relative; z-index: 1; @@ -7632,39 +9016,12 @@ iframe { *zoom: 1; } -.ie7 .masthead nav ul { - margin-top: 5px; -} -.ie7 .masthead nav ul li { - float: left; -} -.ie7 .masthead nav ul li a.active { - position: relative; - top: -1px; - background-color: #8b0606; - border-top: 1px solid #720505; - border-bottom: 1px solid #990707; -} .ie7 .masthead .header-image { display: block; } .ie7 .masthead .account .dropdown-menu { z-index: 10000; } -.ie7 .footer-links { - *zoom: 1; -} -.ie7 .footer-links:before, -.ie7 .footer-links:after { - display: table; - content: ""; -} -.ie7 .footer-links:after { - clear: both; -} -.ie7 .footer-links li { - float: left; -} .ie7 .module-narrow .nav-item.image { *zoom: 1; } @@ -7672,6 +9029,7 @@ iframe { .ie7 .module-narrow .nav-item.image:after { display: table; content: ""; + line-height: 0; } .ie7 .module-narrow .nav-item.image:after { clear: both; @@ -7689,11 +9047,13 @@ iframe { } .ie7 .module-heading { *zoom: 1; + position: relative; } .ie7 .module-heading:before, .ie7 .module-heading:after { display: table; content: ""; + line-height: 0; } .ie7 .module-heading:after { clear: both; @@ -7713,3 +9073,22 @@ iframe { position: relative; zoom: 1; } +.ie7 .resource-item { + position: static; + padding-bottom: 1px; +} +.ie7 .resource-item .heading { + position: relative; +} +.ie7 .resource-item .format-label { + left: -48px; +} +.ie7 .resource-item .btn-group { + position: relative; + float: right; + top: -35px; + right: 0; +} +.ie7 .media-overlay .media-heading { + background-color: #000; +} diff --git a/ckan/public/base/css/red.css b/ckan/public/base/css/red.css index c9d4b17974b..26f22422970 100644 --- a/ckan/public/base/css/red.css +++ b/ckan/public/base/css/red.css @@ -48,11 +48,25 @@ sub { bottom: -0.25em; } img { + /* Responsive images (ensure images don't scale beyond their parents) */ + max-width: 100%; + /* Part 1: Set a maxium relative to the parent */ + + width: auto\9; + /* IE7-8 need help adjusting responsive images */ + + height: auto; + /* Part 2: Scale the height according to the width, otherwise you get stretching */ + vertical-align: middle; border: 0; -ms-interpolation-mode: bicubic; } +#map_canvas img, +.google-maps img { + max-width: none; +} button, input, select, @@ -72,11 +86,21 @@ input::-moz-focus-inner { border: 0; } button, -input[type="button"], +html input[type="button"], input[type="reset"], input[type="submit"] { - cursor: pointer; -webkit-appearance: button; + cursor: pointer; +} +label, +select, +button, +input[type="button"], +input[type="reset"], +input[type="submit"], +input[type="radio"], +input[type="checkbox"] { + cursor: pointer; } input[type="search"] { -webkit-box-sizing: content-box; @@ -92,6 +116,57 @@ textarea { overflow: auto; vertical-align: top; } +@media print { + * { + text-shadow: none !important; + color: #000 !important; + background: transparent !important; + box-shadow: none !important; + } + a, + a:visited { + text-decoration: underline; + } + a[href]:after { + content: " (" attr(href) ")"; + } + abbr[title]:after { + content: " (" attr(title) ")"; + } + .ir a:after, + a[href^="javascript:"]:after, + a[href^="#"]:after { + content: ""; + } + pre, + blockquote { + border: 1px solid #999; + page-break-inside: avoid; + } + thead { + display: table-header-group; + } + tr, + img { + page-break-inside: avoid; + } + img { + max-width: 100% !important; + } + @page { + margin: 0.5cm; + } + p, + h2, + h3 { + orphans: 3; + widows: 3; + } + h2, + h3 { + page-break-after: avoid; + } +} .clearfix { *zoom: 1; } @@ -99,6 +174,7 @@ textarea { .clearfix:after { display: table; content: ""; + line-height: 0; } .clearfix:after { clear: both; @@ -113,28 +189,47 @@ textarea { .input-block-level { display: block; width: 100%; - min-height: 28px; + min-height: 30px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; } body { margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; - color: #4d4d4d; - background-color: #efefef; + font-size: 14px; + line-height: 20px; + color: #444444; + background-color: #eeeeee; } a { - color: #b50909; + color: #c14531; text-decoration: none; } -a:hover { - color: #6c0505; +a:hover, +a:focus { + color: #842f22; text-decoration: underline; } +.img-rounded { + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.img-polaroid { + padding: 4px; + background-color: #fff; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); +} +.img-circle { + -webkit-border-radius: 500px; + -moz-border-radius: 500px; + border-radius: 500px; +} .row { margin-left: -20px; *zoom: 1; @@ -143,15 +238,18 @@ a:hover { .row:after { display: table; content: ""; + line-height: 0; } .row:after { clear: both; } [class*="span"] { float: left; + min-height: 1px; margin-left: 20px; } .container, +.navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 940px; @@ -236,6 +334,7 @@ a:hover { .row-fluid:after { display: table; content: ""; + line-height: 0; } .row-fluid:after { clear: both; @@ -243,65 +342,171 @@ a:hover { .row-fluid [class*="span"] { display: block; width: 100%; - min-height: 28px; + min-height: 30px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; float: left; - margin-left: 2.127659574%; - *margin-left: 2.0744680846382977%; + margin-left: 2.127659574468085%; + *margin-left: 2.074468085106383%; } .row-fluid [class*="span"]:first-child { margin-left: 0; } +.row-fluid .controls-row [class*="span"] + [class*="span"] { + margin-left: 2.127659574468085%; +} .row-fluid .span12 { - width: 99.99999998999999%; - *width: 99.94680850063828%; + width: 100%; + *width: 99.94680851063829%; } .row-fluid .span11 { - width: 91.489361693%; - *width: 91.4361702036383%; + width: 91.48936170212765%; + *width: 91.43617021276594%; } .row-fluid .span10 { - width: 82.97872339599999%; - *width: 82.92553190663828%; + width: 82.97872340425532%; + *width: 82.92553191489361%; } .row-fluid .span9 { - width: 74.468085099%; - *width: 74.4148936096383%; + width: 74.46808510638297%; + *width: 74.41489361702126%; } .row-fluid .span8 { - width: 65.95744680199999%; - *width: 65.90425531263828%; + width: 65.95744680851064%; + *width: 65.90425531914893%; } .row-fluid .span7 { - width: 57.446808505%; - *width: 57.3936170156383%; + width: 57.44680851063829%; + *width: 57.39361702127659%; } .row-fluid .span6 { - width: 48.93617020799999%; - *width: 48.88297871863829%; + width: 48.93617021276595%; + *width: 48.88297872340425%; } .row-fluid .span5 { - width: 40.425531911%; - *width: 40.3723404216383%; + width: 40.42553191489362%; + *width: 40.37234042553192%; } .row-fluid .span4 { - width: 31.914893614%; - *width: 31.8617021246383%; + width: 31.914893617021278%; + *width: 31.861702127659576%; } .row-fluid .span3 { - width: 23.404255317%; - *width: 23.3510638276383%; + width: 23.404255319148934%; + *width: 23.351063829787233%; } .row-fluid .span2 { - width: 14.89361702%; - *width: 14.8404255306383%; + width: 14.893617021276595%; + *width: 14.840425531914894%; } .row-fluid .span1 { - width: 6.382978723%; - *width: 6.329787233638298%; + width: 6.382978723404255%; + *width: 6.329787234042553%; +} +.row-fluid .offset12 { + margin-left: 104.25531914893617%; + *margin-left: 104.14893617021275%; +} +.row-fluid .offset12:first-child { + margin-left: 102.12765957446808%; + *margin-left: 102.02127659574467%; +} +.row-fluid .offset11 { + margin-left: 95.74468085106382%; + *margin-left: 95.6382978723404%; +} +.row-fluid .offset11:first-child { + margin-left: 93.61702127659574%; + *margin-left: 93.51063829787232%; +} +.row-fluid .offset10 { + margin-left: 87.23404255319149%; + *margin-left: 87.12765957446807%; +} +.row-fluid .offset10:first-child { + margin-left: 85.1063829787234%; + *margin-left: 84.99999999999999%; +} +.row-fluid .offset9 { + margin-left: 78.72340425531914%; + *margin-left: 78.61702127659572%; +} +.row-fluid .offset9:first-child { + margin-left: 76.59574468085106%; + *margin-left: 76.48936170212764%; +} +.row-fluid .offset8 { + margin-left: 70.2127659574468%; + *margin-left: 70.10638297872339%; +} +.row-fluid .offset8:first-child { + margin-left: 68.08510638297872%; + *margin-left: 67.9787234042553%; +} +.row-fluid .offset7 { + margin-left: 61.70212765957446%; + *margin-left: 61.59574468085106%; +} +.row-fluid .offset7:first-child { + margin-left: 59.574468085106375%; + *margin-left: 59.46808510638297%; +} +.row-fluid .offset6 { + margin-left: 53.191489361702125%; + *margin-left: 53.085106382978715%; +} +.row-fluid .offset6:first-child { + margin-left: 51.063829787234035%; + *margin-left: 50.95744680851063%; +} +.row-fluid .offset5 { + margin-left: 44.68085106382979%; + *margin-left: 44.57446808510638%; +} +.row-fluid .offset5:first-child { + margin-left: 42.5531914893617%; + *margin-left: 42.4468085106383%; +} +.row-fluid .offset4 { + margin-left: 36.170212765957444%; + *margin-left: 36.06382978723405%; +} +.row-fluid .offset4:first-child { + margin-left: 34.04255319148936%; + *margin-left: 33.93617021276596%; +} +.row-fluid .offset3 { + margin-left: 27.659574468085104%; + *margin-left: 27.5531914893617%; +} +.row-fluid .offset3:first-child { + margin-left: 25.53191489361702%; + *margin-left: 25.425531914893618%; +} +.row-fluid .offset2 { + margin-left: 19.148936170212764%; + *margin-left: 19.04255319148936%; +} +.row-fluid .offset2:first-child { + margin-left: 17.02127659574468%; + *margin-left: 16.914893617021278%; +} +.row-fluid .offset1 { + margin-left: 10.638297872340425%; + *margin-left: 10.53191489361702%; +} +.row-fluid .offset1:first-child { + margin-left: 8.51063829787234%; + *margin-left: 8.404255319148938%; +} +[class*="span"].hide, +.row-fluid [class*="span"].hide { + display: none; +} +[class*="span"].pull-right, +.row-fluid [class*="span"].pull-right { + float: right; } .container { margin-right: auto; @@ -312,6 +517,7 @@ a:hover { .container:after { display: table; content: ""; + line-height: 0; } .container:after { clear: both; @@ -325,25 +531,75 @@ a:hover { .container-fluid:after { display: table; content: ""; + line-height: 0; } .container-fluid:after { clear: both; } p { - margin: 0 0 9px; - font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; -} -p small { - font-size: 11px; - color: #999999; + margin: 0 0 10px; } .lead { - margin-bottom: 18px; - font-size: 20px; + margin-bottom: 20px; + font-size: 21px; font-weight: 200; - line-height: 27px; + line-height: 30px; +} +small { + font-size: 85%; +} +strong { + font-weight: bold; +} +em { + font-style: italic; +} +cite { + font-style: normal; +} +.muted { + color: #999999; +} +a.muted:hover, +a.muted:focus { + color: #808080; +} +.text-warning { + color: #c09853; +} +a.text-warning:hover, +a.text-warning:focus { + color: #a47e3c; +} +.text-error { + color: #b55457; +} +a.text-error:hover, +a.text-error:focus { + color: #954143; +} +.text-info { + color: #3a87ad; +} +a.text-info:hover, +a.text-info:focus { + color: #2d6987; +} +.text-success { + color: #468847; +} +a.text-success:hover, +a.text-success:focus { + color: #356635; +} +.text-left { + text-align: left; +} +.text-right { + text-align: right; +} +.text-center { + text-align: center; } h1, h2, @@ -351,9 +607,10 @@ h3, h4, h5, h6 { - margin: 0; + margin: 10px 0; font-family: inherit; font-weight: bold; + line-height: 20px; color: inherit; text-rendering: optimizelegibility; } @@ -364,60 +621,53 @@ h4 small, h5 small, h6 small { font-weight: normal; + line-height: 1; color: #999999; } -h1 { - font-size: 30px; - line-height: 36px; +h1, +h2, +h3 { + line-height: 40px; } -h1 small { - font-size: 18px; +h1 { + font-size: 38.5px; } h2 { - font-size: 24px; - line-height: 36px; -} -h2 small { - font-size: 18px; + font-size: 31.5px; } h3 { - font-size: 18px; - line-height: 27px; + font-size: 24.5px; } -h3 small { +h4 { + font-size: 17.5px; +} +h5 { font-size: 14px; } -h4, -h5, h6 { - line-height: 18px; + font-size: 11.9px; } -h4 { - font-size: 14px; +h1 small { + font-size: 24.5px; } -h4 small { - font-size: 12px; +h2 small { + font-size: 17.5px; } -h5 { - font-size: 12px; +h3 small { + font-size: 14px; } -h6 { - font-size: 11px; - color: #999999; - text-transform: uppercase; +h4 small { + font-size: 14px; } .page-header { - padding-bottom: 17px; - margin: 18px 0; + padding-bottom: 9px; + margin: 20px 0 30px; border-bottom: 1px solid #eeeeee; } -.page-header h1 { - line-height: 1; -} ul, ol { padding: 0; - margin: 0 0 9px 25px; + margin: 0 0 10px 25px; } ul ul, ul ol, @@ -425,37 +675,57 @@ ol ol, ol ul { margin-bottom: 0; } -ul { - list-style: disc; -} -ol { - list-style: decimal; -} li { - line-height: 18px; + line-height: 20px; } ul.unstyled, ol.unstyled { margin-left: 0; list-style: none; } +ul.inline, +ol.inline { + margin-left: 0; + list-style: none; +} +ul.inline > li, +ol.inline > li { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + padding-left: 5px; + padding-right: 5px; +} dl { - margin-bottom: 18px; + margin-bottom: 20px; } dt, dd { - line-height: 18px; + line-height: 20px; } dt { font-weight: bold; - line-height: 17px; } dd { - margin-left: 9px; + margin-left: 10px; +} +.dl-horizontal { + *zoom: 1; +} +.dl-horizontal:before, +.dl-horizontal:after { + display: table; + content: ""; + line-height: 0; +} +.dl-horizontal:after { + clear: both; } .dl-horizontal dt { float: left; - width: 120px; + width: 160px; clear: left; text-align: right; overflow: hidden; @@ -463,26 +733,18 @@ dd { white-space: nowrap; } .dl-horizontal dd { - margin-left: 130px; + margin-left: 180px; } hr { - margin: 18px 0; + margin: 20px 0; border: 0; border-top: 1px solid #eeeeee; border-bottom: 1px solid #ffffff; } -strong { - font-weight: bold; -} -em { - font-style: italic; -} -.muted { - color: #999999; -} -abbr[title] { +abbr[title], +abbr[data-original-title] { cursor: help; - border-bottom: 1px dotted #ddd; + border-bottom: 1px dotted #999999; } abbr.initialism { font-size: 90%; @@ -490,18 +752,18 @@ abbr.initialism { } blockquote { padding: 0 0 0 15px; - margin: 0 0 18px; + margin: 0 0 20px; border-left: 5px solid #eeeeee; } blockquote p { margin-bottom: 0; - font-size: 16px; + font-size: 17.5px; font-weight: 300; - line-height: 22.5px; + line-height: 1.25; } blockquote small { display: block; - line-height: 18px; + line-height: 20px; color: #999999; } blockquote small:before { @@ -518,6 +780,12 @@ blockquote.pull-right p, blockquote.pull-right small { text-align: right; } +blockquote.pull-right small:before { + content: ''; +} +blockquote.pull-right small:after { + content: '\00A0 \2014'; +} q:before, q:after, blockquote:before, @@ -526,20 +794,14 @@ blockquote:after { } address { display: block; - margin-bottom: 18px; - font-style: normal; - line-height: 18px; -} -small { - font-size: 100%; -} -cite { + margin-bottom: 20px; font-style: normal; + line-height: 20px; } code, pre { padding: 0 3px 2px; - font-family: Menlo, Monaco, Consolas, "Courier New", monospace; + font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 12px; color: #333333; -webkit-border-radius: 3px; @@ -551,13 +813,14 @@ code { color: #d14; background-color: #f7f7f9; border: 1px solid #e1e1e8; + white-space: nowrap; } pre { display: block; - padding: 8.5px; - margin: 0 0 9px; - font-size: 12.025px; - line-height: 18px; + padding: 9.5px; + margin: 0 0 10px; + font-size: 13px; + line-height: 20px; word-break: break-all; word-wrap: break-word; white-space: pre; @@ -570,11 +833,13 @@ pre { border-radius: 4px; } pre.prettyprint { - margin-bottom: 18px; + margin-bottom: 20px; } pre code { padding: 0; color: inherit; + white-space: pre; + white-space: pre-wrap; background-color: transparent; border: 0; } @@ -583,7 +848,7 @@ pre code { overflow-y: scroll; } form { - margin: 0 0 18px; + margin: 0 0 20px; } fieldset { padding: 0; @@ -594,15 +859,15 @@ legend { display: block; width: 100%; padding: 0; - margin-bottom: 27px; - font-size: 19.5px; - line-height: 36px; + margin-bottom: 20px; + font-size: 21px; + line-height: 40px; color: #333333; border: 0; - border-bottom: 1px solid #eee; + border-bottom: 1px solid #e5e5e5; } legend small { - font-size: 13.5px; + font-size: 15px; color: #999999; } label, @@ -610,9 +875,9 @@ input, button, select, textarea { - font-size: 13px; + font-size: 14px; font-weight: normal; - line-height: 18px; + line-height: 20px; } input, button, @@ -623,116 +888,181 @@ textarea { label { display: block; margin-bottom: 5px; - color: #333333; } -input, -textarea, select, +textarea, +input[type="text"], +input[type="password"], +input[type="datetime"], +input[type="datetime-local"], +input[type="date"], +input[type="month"], +input[type="time"], +input[type="week"], +input[type="number"], +input[type="email"], +input[type="url"], +input[type="search"], +input[type="tel"], +input[type="color"], .uneditable-input { display: inline-block; - width: 210px; - height: 18px; - padding: 4px; - margin-bottom: 9px; - font-size: 13px; - line-height: 18px; + height: 20px; + padding: 4px 6px; + margin-bottom: 10px; + font-size: 14px; + line-height: 20px; color: #555555; - background-color: #ffffff; - border: 1px solid #cccccc; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + vertical-align: middle; } -.uneditable-textarea { - width: auto; - height: auto; -} -label input, -label textarea, -label select { - display: block; +input, +textarea, +.uneditable-input { + width: 206px; } -input[type="image"], -input[type="checkbox"], -input[type="radio"] { - width: auto; +textarea { height: auto; - padding: 0; - margin: 3px 0; +} +textarea, +input[type="text"], +input[type="password"], +input[type="datetime"], +input[type="datetime-local"], +input[type="date"], +input[type="month"], +input[type="time"], +input[type="week"], +input[type="number"], +input[type="email"], +input[type="url"], +input[type="search"], +input[type="tel"], +input[type="color"], +.uneditable-input { + background-color: #ffffff; + border: 1px solid #cccccc; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border linear .2s, box-shadow linear .2s; + -moz-transition: border linear .2s, box-shadow linear .2s; + -o-transition: border linear .2s, box-shadow linear .2s; + transition: border linear .2s, box-shadow linear .2s; +} +textarea:focus, +input[type="text"]:focus, +input[type="password"]:focus, +input[type="datetime"]:focus, +input[type="datetime-local"]:focus, +input[type="date"]:focus, +input[type="month"]:focus, +input[type="time"]:focus, +input[type="week"]:focus, +input[type="number"]:focus, +input[type="email"]:focus, +input[type="url"]:focus, +input[type="search"]:focus, +input[type="tel"]:focus, +input[type="color"]:focus, +.uneditable-input:focus { + border-color: rgba(82, 168, 236, 0.8); + outline: 0; + outline: thin dotted \9; + /* IE6-9 */ + + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); +} +input[type="radio"], +input[type="checkbox"] { + margin: 4px 0 0; *margin-top: 0; /* IE7 */ - line-height: normal; - cursor: pointer; - background-color: transparent; - border: 0 \9; - /* IE9 and down */ + margin-top: 1px \9; + /* IE8-9 */ - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -input[type="image"] { - border: 0; -} -input[type="file"] { - width: auto; - padding: initial; - line-height: initial; - background-color: #ffffff; - background-color: initial; - border: initial; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; + line-height: normal; } -input[type="button"], +input[type="file"], +input[type="image"], +input[type="submit"], input[type="reset"], -input[type="submit"] { +input[type="button"], +input[type="radio"], +input[type="checkbox"] { width: auto; - height: auto; } select, input[type="file"] { - height: 28px; + height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ *margin-top: 4px; /* For IE7, add top margin to align select with labels */ - line-height: 28px; -} -input[type="file"] { - line-height: 18px \9; + line-height: 30px; } select { width: 220px; + border: 1px solid #cccccc; background-color: #ffffff; } select[multiple], select[size] { height: auto; } -input[type="image"] { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; +select:focus, +input[type="file"]:focus, +input[type="radio"]:focus, +input[type="checkbox"]:focus { + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; } -textarea { +.uneditable-input, +.uneditable-textarea { + color: #999999; + background-color: #fcfcfc; + border-color: #cccccc; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + cursor: not-allowed; +} +.uneditable-input { + overflow: hidden; + white-space: nowrap; +} +.uneditable-textarea { + width: auto; height: auto; } -input[type="hidden"] { - display: none; +input:-moz-placeholder, +textarea:-moz-placeholder { + color: #999999; +} +input:-ms-input-placeholder, +textarea:-ms-input-placeholder { + color: #999999; +} +input::-webkit-input-placeholder, +textarea::-webkit-input-placeholder { + color: #999999; } .radio, .checkbox { - min-height: 18px; - padding-left: 18px; + min-height: 20px; + padding-left: 20px; } .radio input[type="radio"], .checkbox input[type="checkbox"] { float: left; - margin-left: -18px; + margin-left: -20px; } .controls > .radio:first-child, .controls > .checkbox:first-child { @@ -749,39 +1079,6 @@ input[type="hidden"] { .checkbox.inline + .checkbox.inline { margin-left: 10px; } -input, -textarea { - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; -} -input:focus, -textarea:focus { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); -} -input[type="file"]:focus, -input[type="radio"]:focus, -input[type="checkbox"]:focus, -select:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} .input-mini { width: 60px; } @@ -811,46 +1108,105 @@ textarea[class*="span"], float: none; margin-left: 0; } +.input-append input[class*="span"], +.input-append .uneditable-input[class*="span"], +.input-prepend input[class*="span"], +.input-prepend .uneditable-input[class*="span"], +.row-fluid input[class*="span"], +.row-fluid select[class*="span"], +.row-fluid textarea[class*="span"], +.row-fluid .uneditable-input[class*="span"], +.row-fluid .input-prepend [class*="span"], +.row-fluid .input-append [class*="span"] { + display: inline-block; +} input, textarea, .uneditable-input { margin-left: 0; } -input.span12, textarea.span12, .uneditable-input.span12 { - width: 930px; -} -input.span11, textarea.span11, .uneditable-input.span11 { - width: 850px; -} -input.span10, textarea.span10, .uneditable-input.span10 { - width: 770px; -} -input.span9, textarea.span9, .uneditable-input.span9 { - width: 690px; -} -input.span8, textarea.span8, .uneditable-input.span8 { - width: 610px; -} -input.span7, textarea.span7, .uneditable-input.span7 { - width: 530px; -} -input.span6, textarea.span6, .uneditable-input.span6 { - width: 450px; +.controls-row [class*="span"] + [class*="span"] { + margin-left: 20px; } -input.span5, textarea.span5, .uneditable-input.span5 { - width: 370px; +input.span12, +textarea.span12, +.uneditable-input.span12 { + width: 926px; +} +input.span11, +textarea.span11, +.uneditable-input.span11 { + width: 846px; +} +input.span10, +textarea.span10, +.uneditable-input.span10 { + width: 766px; +} +input.span9, +textarea.span9, +.uneditable-input.span9 { + width: 686px; +} +input.span8, +textarea.span8, +.uneditable-input.span8 { + width: 606px; +} +input.span7, +textarea.span7, +.uneditable-input.span7 { + width: 526px; +} +input.span6, +textarea.span6, +.uneditable-input.span6 { + width: 446px; +} +input.span5, +textarea.span5, +.uneditable-input.span5 { + width: 366px; +} +input.span4, +textarea.span4, +.uneditable-input.span4 { + width: 286px; +} +input.span3, +textarea.span3, +.uneditable-input.span3 { + width: 206px; +} +input.span2, +textarea.span2, +.uneditable-input.span2 { + width: 126px; +} +input.span1, +textarea.span1, +.uneditable-input.span1 { + width: 46px; +} +.controls-row { + *zoom: 1; } -input.span4, textarea.span4, .uneditable-input.span4 { - width: 290px; +.controls-row:before, +.controls-row:after { + display: table; + content: ""; + line-height: 0; } -input.span3, textarea.span3, .uneditable-input.span3 { - width: 210px; +.controls-row:after { + clear: both; } -input.span2, textarea.span2, .uneditable-input.span2 { - width: 130px; +.controls-row [class*="span"], +.row-fluid .controls-row [class*="span"] { + float: left; } -input.span1, textarea.span1, .uneditable-input.span1 { - width: 50px; +.controls-row .checkbox[class*="span"], +.controls-row .radio[class*="span"] { + padding-top: 5px; } input[disabled], select[disabled], @@ -860,7 +1216,6 @@ select[readonly], textarea[readonly] { cursor: not-allowed; background-color: #eeeeee; - border-color: #ddd; } input[type="radio"][disabled], input[type="checkbox"][disabled], @@ -868,24 +1223,33 @@ input[type="radio"][readonly], input[type="checkbox"][readonly] { background-color: transparent; } -.control-group.warning > label, +.control-group.warning .control-label, .control-group.warning .help-block, .control-group.warning .help-inline { color: #c09853; } +.control-group.warning .checkbox, +.control-group.warning .radio, .control-group.warning input, .control-group.warning select, .control-group.warning textarea { color: #c09853; +} +.control-group.warning input, +.control-group.warning select, +.control-group.warning textarea { border-color: #c09853; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { border-color: #a47e3c; - -webkit-box-shadow: 0 0 6px #dbc59e; - -moz-box-shadow: 0 0 6px #dbc59e; - box-shadow: 0 0 6px #dbc59e; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; } .control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { @@ -893,24 +1257,33 @@ input[type="checkbox"][readonly] { background-color: #fcf8e3; border-color: #c09853; } -.control-group.error > label, +.control-group.error .control-label, .control-group.error .help-block, .control-group.error .help-inline { color: #b55457; } +.control-group.error .checkbox, +.control-group.error .radio, .control-group.error input, .control-group.error select, .control-group.error textarea { color: #b55457; +} +.control-group.error input, +.control-group.error select, +.control-group.error textarea { border-color: #b55457; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus { border-color: #954143; - -webkit-box-shadow: 0 0 6px #d49b9d; - -moz-box-shadow: 0 0 6px #d49b9d; - box-shadow: 0 0 6px #d49b9d; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d49b9d; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d49b9d; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d49b9d; } .control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { @@ -918,24 +1291,33 @@ input[type="checkbox"][readonly] { background-color: #f8f0f0; border-color: #b55457; } -.control-group.success > label, +.control-group.success .control-label, .control-group.success .help-block, .control-group.success .help-inline { color: #468847; } +.control-group.success .checkbox, +.control-group.success .radio, .control-group.success input, .control-group.success select, .control-group.success textarea { color: #468847; +} +.control-group.success input, +.control-group.success select, +.control-group.success textarea { border-color: #468847; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus { border-color: #356635; - -webkit-box-shadow: 0 0 6px #7aba7b; - -moz-box-shadow: 0 0 6px #7aba7b; - box-shadow: 0 0 6px #7aba7b; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; } .control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { @@ -943,59 +1325,78 @@ input[type="checkbox"][readonly] { background-color: #dff0d8; border-color: #468847; } -input:focus:required:invalid, -textarea:focus:required:invalid, -select:focus:required:invalid { +.control-group.info .control-label, +.control-group.info .help-block, +.control-group.info .help-inline { + color: #3a87ad; +} +.control-group.info .checkbox, +.control-group.info .radio, +.control-group.info input, +.control-group.info select, +.control-group.info textarea { + color: #3a87ad; +} +.control-group.info input, +.control-group.info select, +.control-group.info textarea { + border-color: #3a87ad; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); +} +.control-group.info input:focus, +.control-group.info select:focus, +.control-group.info textarea:focus { + border-color: #2d6987; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; +} +.control-group.info .input-prepend .add-on, +.control-group.info .input-append .add-on { + color: #3a87ad; + background-color: #d9edf7; + border-color: #3a87ad; +} +input:focus:invalid, +textarea:focus:invalid, +select:focus:invalid { color: #b94a48; border-color: #ee5f5b; } -input:focus:required:invalid:focus, -textarea:focus:required:invalid:focus, -select:focus:required:invalid:focus { +input:focus:invalid:focus, +textarea:focus:invalid:focus, +select:focus:invalid:focus { border-color: #e9322d; -webkit-box-shadow: 0 0 6px #f8b9b7; -moz-box-shadow: 0 0 6px #f8b9b7; box-shadow: 0 0 6px #f8b9b7; } .form-actions { - padding: 17px 20px 18px; - margin-top: 18px; - margin-bottom: 18px; + padding: 19px 20px 20px; + margin-top: 20px; + margin-bottom: 20px; background-color: #f5f5f5; - border-top: 1px solid #ddd; + border-top: 1px solid #e5e5e5; *zoom: 1; } .form-actions:before, .form-actions:after { display: table; content: ""; + line-height: 0; } .form-actions:after { clear: both; } -.uneditable-input { - overflow: hidden; - white-space: nowrap; - cursor: not-allowed; - background-color: #ffffff; - border-color: #eee; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -} -:-moz-placeholder { - color: #999999; -} -::-webkit-input-placeholder { - color: #999999; -} .help-block, .help-inline { - color: #555555; + color: #6a6a6a; } .help-block { display: block; - margin-bottom: 9px; + margin-bottom: 10px; } .help-inline { display: inline-block; @@ -1006,62 +1407,76 @@ select:focus:required:invalid:focus { vertical-align: middle; padding-left: 5px; } -.input-prepend, -.input-append { - margin-bottom: 5px; +.input-append, +.input-prepend { + display: inline-block; + margin-bottom: 10px; + vertical-align: middle; + font-size: 0; + white-space: nowrap; } -.input-prepend input, .input-append input, -.input-prepend select, +.input-prepend input, .input-append select, +.input-prepend select, +.input-append .uneditable-input, .input-prepend .uneditable-input, -.input-append .uneditable-input { +.input-append .dropdown-menu, +.input-prepend .dropdown-menu, +.input-append .popover, +.input-prepend .popover { + font-size: 14px; +} +.input-append input, +.input-prepend input, +.input-append select, +.input-prepend select, +.input-append .uneditable-input, +.input-prepend .uneditable-input { position: relative; margin-bottom: 0; *margin-left: 0; - vertical-align: middle; + vertical-align: top; -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } -.input-prepend input:focus, .input-append input:focus, -.input-prepend select:focus, +.input-prepend input:focus, .input-append select:focus, -.input-prepend .uneditable-input:focus, -.input-append .uneditable-input:focus { +.input-prepend select:focus, +.input-append .uneditable-input:focus, +.input-prepend .uneditable-input:focus { z-index: 2; } -.input-prepend .uneditable-input, -.input-append .uneditable-input { - border-left-color: #ccc; -} -.input-prepend .add-on, -.input-append .add-on { +.input-append .add-on, +.input-prepend .add-on { display: inline-block; width: auto; - height: 18px; + height: 20px; min-width: 16px; padding: 4px 5px; + font-size: 14px; font-weight: normal; - line-height: 18px; + line-height: 20px; text-align: center; text-shadow: 0 1px 0 #ffffff; - vertical-align: middle; background-color: #eeeeee; border: 1px solid #ccc; } -.input-prepend .add-on, .input-append .add-on, +.input-prepend .add-on, +.input-append .btn, .input-prepend .btn, -.input-append .btn { - margin-left: -1px; +.input-append .btn-group > .dropdown-toggle, +.input-prepend .btn-group > .dropdown-toggle { + vertical-align: top; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } -.input-prepend .active, -.input-append .active { +.input-append .active, +.input-prepend .active { background-color: #a9dba9; border-color: #46a546; } @@ -1082,12 +1497,21 @@ select:focus:required:invalid:focus { -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } -.input-append .uneditable-input { - border-right-color: #ccc; - border-left-color: #eee; +.input-append input + .btn-group .btn:last-child, +.input-append select + .btn-group .btn:last-child, +.input-append .uneditable-input + .btn-group .btn:last-child { + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; +} +.input-append .add-on, +.input-append .btn, +.input-append .btn-group { + margin-left: -1px; } .input-append .add-on:last-child, -.input-append .btn:last-child { +.input-append .btn:last-child, +.input-append .btn-group:last-child > .dropdown-toggle { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; @@ -1099,6 +1523,13 @@ select:focus:required:invalid:focus { -moz-border-radius: 0; border-radius: 0; } +.input-prepend.input-append input + .btn-group .btn, +.input-prepend.input-append select + .btn-group .btn, +.input-prepend.input-append .uneditable-input + .btn-group .btn { + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; +} .input-prepend.input-append .add-on:first-child, .input-prepend.input-append .btn:first-child { margin-right: -1px; @@ -1113,7 +1544,10 @@ select:focus:required:invalid:focus { -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } -.search-query { +.input-prepend.input-append .btn-group:first-child { + margin-left: 0; +} +input.search-query { padding-right: 14px; padding-right: 4px \9; padding-left: 14px; @@ -1121,9 +1555,36 @@ select:focus:required:invalid:focus { /* IE7-8 doesn't have border-radius, so don't indent the padding */ margin-bottom: 0; - -webkit-border-radius: 14px; - -moz-border-radius: 14px; - border-radius: 14px; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; +} +/* Allow for input prepend/append in search forms */ +.form-search .input-append .search-query, +.form-search .input-prepend .search-query { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.form-search .input-append .search-query { + -webkit-border-radius: 14px 0 0 14px; + -moz-border-radius: 14px 0 0 14px; + border-radius: 14px 0 0 14px; +} +.form-search .input-append .btn { + -webkit-border-radius: 0 14px 14px 0; + -moz-border-radius: 0 14px 14px 0; + border-radius: 0 14px 14px 0; +} +.form-search .input-prepend .search-query { + -webkit-border-radius: 0 14px 14px 0; + -moz-border-radius: 0 14px 14px 0; + border-radius: 0 14px 14px 0; +} +.form-search .input-prepend .btn { + -webkit-border-radius: 14px 0 0 14px; + -moz-border-radius: 14px 0 0 14px; + border-radius: 14px 0 0 14px; } .form-search input, .form-inline input, @@ -1152,6 +1613,7 @@ select:focus:required:invalid:focus { *zoom: 1; margin-bottom: 0; + vertical-align: middle; } .form-search .hide, .form-inline .hide, @@ -1159,7 +1621,9 @@ select:focus:required:invalid:focus { display: none; } .form-search label, -.form-inline label { +.form-inline label, +.form-search .btn-group, +.form-inline .btn-group { display: inline-block; } .form-search .input-append, @@ -1185,45 +1649,53 @@ select:focus:required:invalid:focus { margin-left: 0; } .control-group { - margin-bottom: 9px; + margin-bottom: 10px; } legend + .control-group { - margin-top: 18px; + margin-top: 20px; -webkit-margin-top-collapse: separate; } .form-horizontal .control-group { - margin-bottom: 18px; + margin-bottom: 20px; *zoom: 1; } .form-horizontal .control-group:before, .form-horizontal .control-group:after { display: table; content: ""; + line-height: 0; } .form-horizontal .control-group:after { clear: both; } .form-horizontal .control-label { float: left; - width: 140px; + width: 160px; padding-top: 5px; text-align: right; } .form-horizontal .controls { *display: inline-block; *padding-left: 20px; - margin-left: 160px; + margin-left: 180px; *margin-left: 0; } .form-horizontal .controls:first-child { - *padding-left: 160px; + *padding-left: 180px; } .form-horizontal .help-block { - margin-top: 9px; margin-bottom: 0; } +.form-horizontal input + .help-block, +.form-horizontal select + .help-block, +.form-horizontal textarea + .help-block, +.form-horizontal .uneditable-input + .help-block, +.form-horizontal .input-prepend + .help-block, +.form-horizontal .input-append + .help-block { + margin-top: 10px; +} .form-horizontal .form-actions { - padding-left: 160px; + padding-left: 180px; } table { max-width: 100%; @@ -1233,12 +1705,12 @@ table { } .table { width: 100%; - margin-bottom: 18px; + margin-bottom: 20px; } .table th, .table td { padding: 8px; - line-height: 18px; + line-height: 20px; text-align: left; vertical-align: top; border-top: 1px solid #dddddd; @@ -1260,6 +1732,9 @@ table { .table tbody + tbody { border-top: 2px solid #dddddd; } +.table .table { + background-color: #eeeeee; +} .table-condensed th, .table-condensed td { padding: 4px 5px; @@ -1267,7 +1742,7 @@ table { .table-bordered { border: 1px solid #dddddd; border-collapse: separate; - *border-collapse: collapsed; + *border-collapse: collapse; border-left: 0; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -1288,160 +1763,175 @@ table { .table-bordered tbody:first-child tr:first-child td { border-top: 0; } -.table-bordered thead:first-child tr:first-child th:first-child, -.table-bordered tbody:first-child tr:first-child td:first-child { +.table-bordered thead:first-child tr:first-child > th:first-child, +.table-bordered tbody:first-child tr:first-child > td:first-child, +.table-bordered tbody:first-child tr:first-child > th:first-child { -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; } -.table-bordered thead:first-child tr:first-child th:last-child, -.table-bordered tbody:first-child tr:first-child td:last-child { +.table-bordered thead:first-child tr:first-child > th:last-child, +.table-bordered tbody:first-child tr:first-child > td:last-child, +.table-bordered tbody:first-child tr:first-child > th:last-child { -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; } -.table-bordered thead:last-child tr:last-child th:first-child, -.table-bordered tbody:last-child tr:last-child td:first-child { - -webkit-border-radius: 0 0 0 4px; - -moz-border-radius: 0 0 0 4px; - border-radius: 0 0 0 4px; +.table-bordered thead:last-child tr:last-child > th:first-child, +.table-bordered tbody:last-child tr:last-child > td:first-child, +.table-bordered tbody:last-child tr:last-child > th:first-child, +.table-bordered tfoot:last-child tr:last-child > td:first-child, +.table-bordered tfoot:last-child tr:last-child > th:first-child { -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } -.table-bordered thead:last-child tr:last-child th:last-child, -.table-bordered tbody:last-child tr:last-child td:last-child { +.table-bordered thead:last-child tr:last-child > th:last-child, +.table-bordered tbody:last-child tr:last-child > td:last-child, +.table-bordered tbody:last-child tr:last-child > th:last-child, +.table-bordered tfoot:last-child tr:last-child > td:last-child, +.table-bordered tfoot:last-child tr:last-child > th:last-child { -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; } -.table-striped tbody tr:nth-child(odd) td, -.table-striped tbody tr:nth-child(odd) th { +.table-bordered tfoot + tbody:last-child tr:last-child td:first-child { + -webkit-border-bottom-left-radius: 0; + -moz-border-radius-bottomleft: 0; + border-bottom-left-radius: 0; +} +.table-bordered tfoot + tbody:last-child tr:last-child td:last-child { + -webkit-border-bottom-right-radius: 0; + -moz-border-radius-bottomright: 0; + border-bottom-right-radius: 0; +} +.table-bordered caption + thead tr:first-child th:first-child, +.table-bordered caption + tbody tr:first-child td:first-child, +.table-bordered colgroup + thead tr:first-child th:first-child, +.table-bordered colgroup + tbody tr:first-child td:first-child { + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; +} +.table-bordered caption + thead tr:first-child th:last-child, +.table-bordered caption + tbody tr:first-child td:last-child, +.table-bordered colgroup + thead tr:first-child th:last-child, +.table-bordered colgroup + tbody tr:first-child td:last-child { + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; +} +.table-striped tbody > tr:nth-child(odd) > td, +.table-striped tbody > tr:nth-child(odd) > th { background-color: #f9f9f9; } -.table tbody tr:hover td, -.table tbody tr:hover th { +.table-hover tbody tr:hover > td, +.table-hover tbody tr:hover > th { background-color: #f5f5f5; } -table .span1 { +table td[class*="span"], +table th[class*="span"], +.row-fluid table td[class*="span"], +.row-fluid table th[class*="span"] { + display: table-cell; + float: none; + margin-left: 0; +} +.table td.span1, +.table th.span1 { float: none; width: 44px; margin-left: 0; } -table .span2 { +.table td.span2, +.table th.span2 { float: none; width: 124px; margin-left: 0; } -table .span3 { +.table td.span3, +.table th.span3 { float: none; width: 204px; margin-left: 0; } -table .span4 { +.table td.span4, +.table th.span4 { float: none; width: 284px; margin-left: 0; } -table .span5 { +.table td.span5, +.table th.span5 { float: none; width: 364px; margin-left: 0; } -table .span6 { +.table td.span6, +.table th.span6 { float: none; width: 444px; margin-left: 0; } -table .span7 { +.table td.span7, +.table th.span7 { float: none; width: 524px; margin-left: 0; } -table .span8 { +.table td.span8, +.table th.span8 { float: none; width: 604px; margin-left: 0; } -table .span9 { +.table td.span9, +.table th.span9 { float: none; width: 684px; margin-left: 0; } -table .span10 { +.table td.span10, +.table th.span10 { float: none; width: 764px; margin-left: 0; } -table .span11 { +.table td.span11, +.table th.span11 { float: none; width: 844px; margin-left: 0; } -table .span12 { +.table td.span12, +.table th.span12 { float: none; width: 924px; margin-left: 0; } -table .span13 { - float: none; - width: 1004px; - margin-left: 0; -} -table .span14 { - float: none; - width: 1084px; - margin-left: 0; -} -table .span15 { - float: none; - width: 1164px; - margin-left: 0; -} -table .span16 { - float: none; - width: 1244px; - margin-left: 0; -} -table .span17 { - float: none; - width: 1324px; - margin-left: 0; +.table tbody tr.success > td { + background-color: #dff0d8; } -table .span18 { - float: none; - width: 1404px; - margin-left: 0; +.table tbody tr.error > td { + background-color: #f8f0f0; } -table .span19 { - float: none; - width: 1484px; - margin-left: 0; +.table tbody tr.warning > td { + background-color: #fcf8e3; } -table .span20 { - float: none; - width: 1564px; - margin-left: 0; +.table tbody tr.info > td { + background-color: #d9edf7; } -table .span21 { - float: none; - width: 1644px; - margin-left: 0; +.table-hover tbody tr.success:hover > td { + background-color: #d0e9c6; } -table .span22 { - float: none; - width: 1724px; - margin-left: 0; +.table-hover tbody tr.error:hover > td { + background-color: #f0dfe0; } -table .span23 { - float: none; - width: 1804px; - margin-left: 0; +.table-hover tbody tr.warning:hover > td { + background-color: #faf2cc; } -table .span24 { - float: none; - width: 1884px; - margin-left: 0; +.table-hover tbody tr.info:hover > td { + background-color: #c4e3f3; } .dropup, .dropdown { @@ -1463,18 +1953,11 @@ table .span24 { border-right: 4px solid transparent; border-left: 4px solid transparent; content: ""; - opacity: 0.3; - filter: alpha(opacity=30); } .dropdown .caret { margin-top: 8px; margin-left: 2px; } -.dropdown:hover .caret, -.open .caret { - opacity: 1; - filter: alpha(opacity=100); -} .dropdown-menu { position: absolute; top: 100%; @@ -1483,17 +1966,17 @@ table .span24 { display: none; float: left; min-width: 160px; - padding: 4px 0; - margin: 1px 0 0; + padding: 5px 0; + margin: 2px 0 0; list-style: none; background-color: #ffffff; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); *border-right-width: 2px; *border-bottom-width: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); @@ -1508,35 +1991,71 @@ table .span24 { .dropdown-menu .divider { *width: 100%; height: 1px; - margin: 8px 1px; + margin: 9px 1px; *margin: -5px 0 5px; overflow: hidden; background-color: #e5e5e5; border-bottom: 1px solid #ffffff; } -.dropdown-menu a { +.dropdown-menu > li > a { display: block; - padding: 3px 15px; + padding: 3px 20px; clear: both; font-weight: normal; - line-height: 18px; + line-height: 20px; color: #333333; white-space: nowrap; } -.dropdown-menu li > a:hover, -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { +.dropdown-menu > li > a:hover, +.dropdown-menu > li > a:focus, +.dropdown-submenu:hover > a, +.dropdown-submenu:focus > a { + text-decoration: none; + color: #ffffff; + background-color: #b9422f; + background-image: -moz-linear-gradient(top, #c14531, #ad3e2c); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#c14531), to(#ad3e2c)); + background-image: -webkit-linear-gradient(top, #c14531, #ad3e2c); + background-image: -o-linear-gradient(top, #c14531, #ad3e2c); + background-image: linear-gradient(to bottom, #c14531, #ad3e2c); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc14531', endColorstr='#ffad3e2c', GradientType=0); +} +.dropdown-menu > .active > a, +.dropdown-menu > .active > a:hover, +.dropdown-menu > .active > a:focus { color: #ffffff; text-decoration: none; - background-color: #b50909; + outline: 0; + background-color: #b9422f; + background-image: -moz-linear-gradient(top, #c14531, #ad3e2c); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#c14531), to(#ad3e2c)); + background-image: -webkit-linear-gradient(top, #c14531, #ad3e2c); + background-image: -o-linear-gradient(top, #c14531, #ad3e2c); + background-image: linear-gradient(to bottom, #c14531, #ad3e2c); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc14531', endColorstr='#ffad3e2c', GradientType=0); +} +.dropdown-menu > .disabled > a, +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { + color: #999999; +} +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { + text-decoration: none; + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + cursor: default; } .open { *z-index: 1000; } -.open .dropdown-menu { +.open > .dropdown-menu { display: block; } -.pull-right .dropdown-menu { +.pull-right > .dropdown-menu { right: 0; left: auto; } @@ -1544,7 +2063,7 @@ table .span24 { .navbar-fixed-bottom .dropdown .caret { border-top: 0; border-bottom: 4px solid #000000; - content: "\2191"; + content: ""; } .dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { @@ -1552,7 +2071,62 @@ table .span24 { bottom: 100%; margin-bottom: 1px; } +.dropdown-submenu { + position: relative; +} +.dropdown-submenu > .dropdown-menu { + top: 0; + left: 100%; + margin-top: -6px; + margin-left: -1px; + -webkit-border-radius: 0 6px 6px 6px; + -moz-border-radius: 0 6px 6px 6px; + border-radius: 0 6px 6px 6px; +} +.dropdown-submenu:hover > .dropdown-menu { + display: block; +} +.dropup .dropdown-submenu > .dropdown-menu { + top: auto; + bottom: 0; + margin-top: 0; + margin-bottom: -2px; + -webkit-border-radius: 5px 5px 5px 0; + -moz-border-radius: 5px 5px 5px 0; + border-radius: 5px 5px 5px 0; +} +.dropdown-submenu > a:after { + display: block; + content: " "; + float: right; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; + border-width: 5px 0 5px 5px; + border-left-color: #cccccc; + margin-top: 5px; + margin-right: -10px; +} +.dropdown-submenu:hover > a:after { + border-left-color: #ffffff; +} +.dropdown-submenu.pull-left { + float: none; +} +.dropdown-submenu.pull-left > .dropdown-menu { + left: -100%; + margin-left: 10px; + -webkit-border-radius: 6px 0 6px 6px; + -moz-border-radius: 6px 0 6px 6px; + border-radius: 6px 0 6px 6px; +} +.dropdown .dropdown-menu .nav-header { + padding-left: 20px; + padding-right: 20px; +} .typeahead { + z-index: 1051; margin-top: 2px; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -1563,8 +2137,7 @@ table .span24 { padding: 19px; margin-bottom: 20px; background-color: #f5f5f5; - border: 1px solid #eee; - border: 1px solid rgba(0, 0, 0, 0.05); + border: 1px solid #e3e3e3; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -1590,16 +2163,13 @@ table .span24 { } .fade { opacity: 0; - filter: alpha(opacity=0); -webkit-transition: opacity 0.15s linear; -moz-transition: opacity 0.15s linear; - -ms-transition: opacity 0.15s linear; -o-transition: opacity 0.15s linear; transition: opacity 0.15s linear; } .fade.in { opacity: 1; - filter: alpha(opacity=100); } .collapse { position: relative; @@ -1607,7 +2177,6 @@ table .span24 { overflow: hidden; -webkit-transition: height 0.35s ease; -moz-transition: height 0.35s ease; - -ms-transition: height 0.35s ease; -o-transition: height 0.35s ease; transition: height 0.35s ease; } @@ -1618,13 +2187,14 @@ table .span24 { float: right; font-size: 20px; font-weight: bold; - line-height: 18px; + line-height: 20px; color: #000000; text-shadow: 0 1px 0 #ffffff; opacity: 0.2; filter: alpha(opacity=20); } -.close:hover { +.close:hover, +.close:focus { color: #000000; text-decoration: none; cursor: pointer; @@ -1644,25 +2214,23 @@ button.close { /* IE7 inline-block hack */ *zoom: 1; - padding: 4px 10px 4px; + padding: 4px 12px; margin-bottom: 0; - font-size: 13px; - line-height: 18px; - *line-height: 20px; - color: #333333; + font-size: 14px; + line-height: 20px; text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); vertical-align: middle; cursor: pointer; + color: #333333; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); background-color: #f7f7f7; background-image: -moz-linear-gradient(top, #ffffff, #eaeaea); - background-image: -ms-linear-gradient(top, #ffffff, #eaeaea); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#eaeaea)); background-image: -webkit-linear-gradient(top, #ffffff, #eaeaea); background-image: -o-linear-gradient(top, #ffffff, #eaeaea); - background-image: linear-gradient(top, #ffffff, #eaeaea); + background-image: linear-gradient(to bottom, #ffffff, #eaeaea); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#eaeaea', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeaeaea', GradientType=0); border-color: #eaeaea #eaeaea #c4c4c4; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #eaeaea; @@ -1681,10 +2249,12 @@ button.close { box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); } .btn:hover, +.btn:focus, .btn:active, .btn.active, .btn.disabled, .btn[disabled] { + color: #333333; background-color: #eaeaea; *background-color: #dddddd; } @@ -1695,17 +2265,13 @@ button.close { .btn:first-child { *margin-left: 0; } -.btn:hover { +.btn:hover, +.btn:focus { color: #333333; text-decoration: none; - background-color: #e6e6e6; - *background-color: #d9d9d9; - /* Buttons in IE7 don't get borders, so darken on hover */ - background-position: 0 -15px; -webkit-transition: background-position 0.1s linear; -moz-transition: background-position 0.1s linear; - -ms-transition: background-position 0.1s linear; -o-transition: background-position 0.1s linear; transition: background-position 0.1s linear; } @@ -1716,8 +2282,6 @@ button.close { } .btn.active, .btn:active { - background-color: #e6e6e6; - background-color: #d9d9d9 \9; background-image: none; outline: 0; -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); @@ -1727,7 +2291,6 @@ button.close { .btn.disabled, .btn[disabled] { cursor: default; - background-color: #e6e6e6; background-image: none; opacity: 0.65; filter: alpha(opacity=65); @@ -1736,43 +2299,54 @@ button.close { box-shadow: none; } .btn-large { - padding: 9px 14px; - font-size: 15px; - line-height: normal; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; + padding: 11px 19px; + font-size: 17.5px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } -.btn-large [class^="icon-"] { - margin-top: 1px; +.btn-large [class^="icon-"], +.btn-large [class*=" icon-"] { + margin-top: 4px; } .btn-small { - padding: 5px 9px; - font-size: 11px; - line-height: 16px; + padding: 2px 10px; + font-size: 11.9px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.btn-small [class^="icon-"] { +.btn-small [class^="icon-"], +.btn-small [class*=" icon-"] { + margin-top: 0; +} +.btn-mini [class^="icon-"], +.btn-mini [class*=" icon-"] { margin-top: -1px; } .btn-mini { - padding: 2px 6px; - font-size: 11px; - line-height: 14px; + padding: 0 6px; + font-size: 10.5px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.btn-primary, -.btn-primary:hover, -.btn-warning, -.btn-warning:hover, -.btn-danger, -.btn-danger:hover, -.btn-success, -.btn-success:hover, -.btn-info, -.btn-info:hover, -.btn-inverse, -.btn-inverse:hover { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +.btn-block { + display: block; + width: 100%; + padding-left: 0; + padding-right: 0; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.btn-block + .btn-block { + margin-top: 5px; +} +input[type="submit"].btn-block, +input[type="reset"].btn-block, +input[type="button"].btn-block { + width: 100%; } .btn-primary.active, .btn-warning.active, @@ -1782,49 +2356,49 @@ button.close { .btn-inverse.active { color: rgba(255, 255, 255, 0.75); } -.btn { - border-color: #ccc; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} .btn-primary { - background-color: #f65454; - background-image: -moz-linear-gradient(top, #f54444, #f76b6b); - background-image: -ms-linear-gradient(top, #f54444, #f76b6b); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f54444), to(#f76b6b)); - background-image: -webkit-linear-gradient(top, #f54444, #f76b6b); - background-image: -o-linear-gradient(top, #f54444, #f76b6b); - background-image: linear-gradient(top, #f54444, #f76b6b); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #cc5845; + background-image: -moz-linear-gradient(top, #d36452, #c14531); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d36452), to(#c14531)); + background-image: -webkit-linear-gradient(top, #d36452, #c14531); + background-image: -o-linear-gradient(top, #d36452, #c14531); + background-image: linear-gradient(to bottom, #d36452, #c14531); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f54444', endColorstr='#f76b6b', GradientType=0); - border-color: #f76b6b #f76b6b #f32222; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd36452', endColorstr='#ffc14531', GradientType=0); + border-color: #c14531 #c14531 #842f22; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #f76b6b; + *background-color: #c14531; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-primary:hover, +.btn-primary:focus, .btn-primary:active, .btn-primary.active, .btn-primary.disabled, .btn-primary[disabled] { - background-color: #f76b6b; - *background-color: #f65353; + color: #ffffff; + background-color: #c14531; + *background-color: #ad3e2c; } .btn-primary:active, .btn-primary.active { - background-color: #f43b3b \9; + background-color: #983627 \9; } .btn-warning { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #faa732; background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-linear-gradient(top, #fbb450, #f89406); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); background-image: -webkit-linear-gradient(top, #fbb450, #f89406); background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(top, #fbb450, #f89406); + background-image: linear-gradient(to bottom, #fbb450, #f89406); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); border-color: #f89406 #f89406 #ad6704; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #f89406; @@ -1833,10 +2407,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-warning:hover, +.btn-warning:focus, .btn-warning:active, .btn-warning.active, .btn-warning.disabled, .btn-warning[disabled] { + color: #ffffff; background-color: #f89406; *background-color: #df8505; } @@ -1845,15 +2421,16 @@ button.close { background-color: #c67605 \9; } .btn-danger { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #da4f49; background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(top, #ee5f5b, #bd362f); + background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0); border-color: #bd362f #bd362f #802420; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #bd362f; @@ -1862,10 +2439,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-danger:hover, +.btn-danger:focus, .btn-danger:active, .btn-danger.active, .btn-danger.disabled, .btn-danger[disabled] { + color: #ffffff; background-color: #bd362f; *background-color: #a9302a; } @@ -1874,15 +2453,16 @@ button.close { background-color: #942a25 \9; } .btn-success { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #5bb75b; background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-linear-gradient(top, #62c462, #51a351); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); background-image: -webkit-linear-gradient(top, #62c462, #51a351); background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(top, #62c462, #51a351); + background-image: linear-gradient(to bottom, #62c462, #51a351); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0); border-color: #51a351 #51a351 #387038; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #51a351; @@ -1891,10 +2471,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-success:hover, +.btn-success:focus, .btn-success:active, .btn-success.active, .btn-success.disabled, .btn-success[disabled] { + color: #ffffff; background-color: #51a351; *background-color: #499249; } @@ -1903,15 +2485,16 @@ button.close { background-color: #408140 \9; } .btn-info { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #49afcd; background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(top, #5bc0de, #2f96b4); + background-image: linear-gradient(to bottom, #5bc0de, #2f96b4); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0); border-color: #2f96b4 #2f96b4 #1f6377; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #2f96b4; @@ -1920,10 +2503,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-info:hover, +.btn-info:focus, .btn-info:active, .btn-info.active, .btn-info.disabled, .btn-info[disabled] { + color: #ffffff; background-color: #2f96b4; *background-color: #2a85a0; } @@ -1932,15 +2517,16 @@ button.close { background-color: #24748c \9; } .btn-inverse { - background-color: #414141; - background-image: -moz-linear-gradient(top, #555555, #222222); - background-image: -ms-linear-gradient(top, #555555, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); - background-image: -webkit-linear-gradient(top, #555555, #222222); - background-image: -o-linear-gradient(top, #555555, #222222); - background-image: linear-gradient(top, #555555, #222222); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #363636; + background-image: -moz-linear-gradient(top, #444444, #222222); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222)); + background-image: -webkit-linear-gradient(top, #444444, #222222); + background-image: -o-linear-gradient(top, #444444, #222222); + background-image: linear-gradient(to bottom, #444444, #222222); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0); border-color: #222222 #222222 #000000; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #222222; @@ -1949,10 +2535,12 @@ button.close { filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-inverse:hover, +.btn-inverse:focus, .btn-inverse:active, .btn-inverse.active, .btn-inverse.disabled, .btn-inverse[disabled] { + color: #ffffff; background-color: #222222; *background-color: #151515; } @@ -1962,8 +2550,8 @@ button.close { } button.btn, input[type="submit"].btn { - *padding-top: 2px; - *padding-bottom: 2px; + *padding-top: 3px; + *padding-bottom: 3px; } button.btn::-moz-focus-inner, input[type="submit"].btn::-moz-focus-inner { @@ -1985,19 +2573,46 @@ input[type="submit"].btn.btn-mini { *padding-top: 1px; *padding-bottom: 1px; } +.btn-link, +.btn-link:active, +.btn-link[disabled] { + background-color: transparent; + background-image: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} +.btn-link { + border-color: transparent; + cursor: pointer; + color: #c14531; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.btn-link:hover, +.btn-link:focus { + color: #842f22; + text-decoration: underline; + background-color: transparent; +} +.btn-link[disabled]:hover, +.btn-link[disabled]:focus { + color: #333333; + text-decoration: none; +} .btn-group { position: relative; + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + *zoom: 1; + font-size: 0; + vertical-align: middle; + white-space: nowrap; *margin-left: .3em; } -.btn-group:before, -.btn-group:after { - display: table; - content: ""; -} -.btn-group:after { - clear: both; -} .btn-group:first-child { *margin-left: 0; } @@ -2005,24 +2620,38 @@ input[type="submit"].btn.btn-mini { margin-left: 5px; } .btn-toolbar { - margin-top: 9px; - margin-bottom: 9px; + font-size: 0; + margin-top: 10px; + margin-bottom: 10px; } -.btn-toolbar .btn-group { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; +.btn-toolbar > .btn + .btn, +.btn-toolbar > .btn-group + .btn, +.btn-toolbar > .btn + .btn-group { + margin-left: 5px; } .btn-group > .btn { position: relative; - float: left; - margin-left: -1px; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } +.btn-group > .btn + .btn { + margin-left: -1px; +} +.btn-group > .btn, +.btn-group > .dropdown-menu, +.btn-group > .popover { + font-size: 14px; +} +.btn-group > .btn-mini { + font-size: 10.5px; +} +.btn-group > .btn-small { + font-size: 11.9px; +} +.btn-group > .btn-large { + font-size: 17.5px; +} .btn-group > .btn:first-child { margin-left: 0; -webkit-border-top-left-radius: 4px; @@ -2069,26 +2698,30 @@ input[type="submit"].btn.btn-mini { .btn-group.open .dropdown-toggle { outline: 0; } -.btn-group > .dropdown-toggle { +.btn-group > .btn + .dropdown-toggle { padding-left: 8px; padding-right: 8px; -webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); -moz-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); - *padding-top: 4px; - *padding-bottom: 4px; + *padding-top: 5px; + *padding-bottom: 5px; } -.btn-group > .btn-mini.dropdown-toggle { +.btn-group > .btn-mini + .dropdown-toggle { padding-left: 5px; padding-right: 5px; + *padding-top: 2px; + *padding-bottom: 2px; } -.btn-group > .btn-small.dropdown-toggle { - *padding-top: 4px; +.btn-group > .btn-small + .dropdown-toggle { + *padding-top: 5px; *padding-bottom: 4px; } -.btn-group > .btn-large.dropdown-toggle { +.btn-group > .btn-large + .dropdown-toggle { padding-left: 12px; padding-right: 12px; + *padding-top: 7px; + *padding-bottom: 7px; } .btn-group.open .dropdown-toggle { background-image: none; @@ -2100,7 +2733,7 @@ input[type="submit"].btn.btn-mini { background-color: #eaeaea; } .btn-group.open .btn-primary.dropdown-toggle { - background-color: #f76b6b; + background-color: #c14531; } .btn-group.open .btn-warning.dropdown-toggle { background-color: #f89406; @@ -2118,29 +2751,23 @@ input[type="submit"].btn.btn-mini { background-color: #222222; } .btn .caret { - margin-top: 7px; + margin-top: 8px; margin-left: 0; } -.btn:hover .caret, -.open.btn-group .caret { - opacity: 1; - filter: alpha(opacity=100); -} -.btn-mini .caret { - margin-top: 5px; -} -.btn-small .caret { +.btn-large .caret { margin-top: 6px; } .btn-large .caret { - margin-top: 6px; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; } +.btn-mini .caret, +.btn-small .caret { + margin-top: 8px; +} .dropup .btn-large .caret { - border-bottom: 5px solid #000000; - border-top: 0; + border-bottom-width: 5px; } .btn-primary .caret, .btn-warning .caret, @@ -2150,45 +2777,95 @@ input[type="submit"].btn.btn-mini { .btn-inverse .caret { border-top-color: #ffffff; border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +} +.btn-group-vertical { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; +} +.btn-group-vertical > .btn { + display: block; + float: none; + max-width: 100%; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.btn-group-vertical > .btn + .btn { + margin-left: 0; + margin-top: -1px; +} +.btn-group-vertical > .btn:first-child { + -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; +} +.btn-group-vertical > .btn:last-child { + -webkit-border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; + border-radius: 0 0 4px 4px; +} +.btn-group-vertical > .btn-large:first-child { + -webkit-border-radius: 6px 6px 0 0; + -moz-border-radius: 6px 6px 0 0; + border-radius: 6px 6px 0 0; +} +.btn-group-vertical > .btn-large:last-child { + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; } .alert { padding: 8px 35px 8px 14px; - margin-bottom: 18px; + margin-bottom: 20px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); background-color: #fcf8e3; border: 1px solid #fbeed5; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; +} +.alert, +.alert h4 { color: #c09853; } -.alert-heading { - color: inherit; +.alert h4 { + margin: 0; } .alert .close { position: relative; top: -2px; right: -21px; - line-height: 18px; + line-height: 20px; } .alert-success { background-color: #dff0d8; border-color: #d6e9c6; color: #468847; } +.alert-success h4 { + color: #468847; +} .alert-danger, .alert-error { background-color: #f8f0f0; border-color: #c6898b; color: #b55457; } +.alert-danger h4, +.alert-error h4 { + color: #b55457; +} .alert-info { background-color: #d9edf7; border-color: #bce8f1; color: #3a87ad; } +.alert-info h4 { + color: #3a87ad; +} .alert-block { padding-top: 14px; padding-bottom: 14px; @@ -2202,25 +2879,29 @@ input[type="submit"].btn.btn-mini { } .nav { margin-left: 0; - margin-bottom: 18px; + margin-bottom: 20px; list-style: none; } .nav > li > a { display: block; } -.nav > li > a:hover { +.nav > li > a:hover, +.nav > li > a:focus { text-decoration: none; background-color: #eeeeee; } +.nav > li > a > img { + max-width: none; +} .nav > .pull-right { float: right; } -.nav .nav-header { +.nav-header { display: block; padding: 3px 15px; font-size: 11px; font-weight: bold; - line-height: 18px; + line-height: 20px; color: #999999; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); text-transform: uppercase; @@ -2243,18 +2924,20 @@ input[type="submit"].btn.btn-mini { padding: 3px 15px; } .nav-list > .active > a, -.nav-list > .active > a:hover { +.nav-list > .active > a:hover, +.nav-list > .active > a:focus { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #b50909; + background-color: #c14531; } -.nav-list [class^="icon-"] { +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { margin-right: 2px; } .nav-list .divider { *width: 100%; height: 1px; - margin: 8px 1px; + margin: 9px 1px; *margin: -5px 0 5px; overflow: hidden; background-color: #e5e5e5; @@ -2270,6 +2953,7 @@ input[type="submit"].btn.btn-mini { .nav-pills:after { display: table; content: ""; + line-height: 0; } .nav-tabs:after, .nav-pills:after { @@ -2295,19 +2979,21 @@ input[type="submit"].btn.btn-mini { .nav-tabs > li > a { padding-top: 8px; padding-bottom: 8px; - line-height: 18px; + line-height: 20px; border: 1px solid transparent; -webkit-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0; } -.nav-tabs > li > a:hover { +.nav-tabs > li > a:hover, +.nav-tabs > li > a:focus { border-color: #eeeeee #eeeeee #dddddd; } .nav-tabs > .active > a, -.nav-tabs > .active > a:hover { +.nav-tabs > .active > a:hover, +.nav-tabs > .active > a:focus { color: #555555; - background-color: #ffffff; + background-color: #eeeeee; border: 1px solid #ddd; border-bottom-color: transparent; cursor: default; @@ -2322,9 +3008,10 @@ input[type="submit"].btn.btn-mini { border-radius: 5px; } .nav-pills > .active > a, -.nav-pills > .active > a:hover { +.nav-pills > .active > a:hover, +.nav-pills > .active > a:focus { color: #ffffff; - background-color: #b50909; + background-color: #c14531; } .nav-stacked > li { float: none; @@ -2342,16 +3029,23 @@ input[type="submit"].btn.btn-mini { border-radius: 0; } .nav-tabs.nav-stacked > li:first-child > a { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; } .nav-tabs.nav-stacked > li:last-child > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } -.nav-tabs.nav-stacked > li > a:hover { +.nav-tabs.nav-stacked > li > a:hover, +.nav-tabs.nav-stacked > li > a:focus { border-color: #ddd; z-index: 2; } @@ -2362,51 +3056,60 @@ input[type="submit"].btn.btn-mini { margin-bottom: 1px; } .nav-tabs .dropdown-menu { - -webkit-border-radius: 0 0 5px 5px; - -moz-border-radius: 0 0 5px 5px; - border-radius: 0 0 5px 5px; + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; } .nav-pills .dropdown-menu { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } -.nav-tabs .dropdown-toggle .caret, -.nav-pills .dropdown-toggle .caret { - border-top-color: #b50909; - border-bottom-color: #b50909; +.nav .dropdown-toggle .caret { + border-top-color: #c14531; + border-bottom-color: #c14531; margin-top: 6px; } -.nav-tabs .dropdown-toggle:hover .caret, -.nav-pills .dropdown-toggle:hover .caret { - border-top-color: #6c0505; - border-bottom-color: #6c0505; +.nav .dropdown-toggle:hover .caret, +.nav .dropdown-toggle:focus .caret { + border-top-color: #842f22; + border-bottom-color: #842f22; } -.nav-tabs .active .dropdown-toggle .caret, -.nav-pills .active .dropdown-toggle .caret { - border-top-color: #333333; - border-bottom-color: #333333; +/* move down carets for tabs */ +.nav-tabs .dropdown-toggle .caret { + margin-top: 8px; } -.nav > .dropdown.active > a:hover { - color: #000000; +.nav .active .dropdown-toggle .caret { + border-top-color: #fff; + border-bottom-color: #fff; +} +.nav-tabs .active .dropdown-toggle .caret { + border-top-color: #555555; + border-bottom-color: #555555; +} +.nav > .dropdown.active > a:hover, +.nav > .dropdown.active > a:focus { cursor: pointer; } .nav-tabs .open .dropdown-toggle, .nav-pills .open .dropdown-toggle, -.nav > li.dropdown.open.active > a:hover { +.nav > li.dropdown.open.active > a:hover, +.nav > li.dropdown.open.active > a:focus { color: #ffffff; background-color: #999999; border-color: #999999; } .nav li.dropdown.open .caret, .nav li.dropdown.open.active .caret, -.nav li.dropdown.open a:hover .caret { +.nav li.dropdown.open a:hover .caret, +.nav li.dropdown.open a:focus .caret { border-top-color: #ffffff; border-bottom-color: #ffffff; opacity: 1; filter: alpha(opacity=100); } -.tabs-stacked .open > a:hover { +.tabs-stacked .open > a:hover, +.tabs-stacked .open > a:focus { border-color: #999999; } .tabbable { @@ -2416,6 +3119,7 @@ input[type="submit"].btn.btn-mini { .tabbable:after { display: table; content: ""; + line-height: 0; } .tabbable:after { clear: both; @@ -2448,12 +3152,14 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px; } -.tabs-below > .nav-tabs > li > a:hover { +.tabs-below > .nav-tabs > li > a:hover, +.tabs-below > .nav-tabs > li > a:focus { border-bottom-color: transparent; border-top-color: #ddd; } .tabs-below > .nav-tabs > .active > a, -.tabs-below > .nav-tabs > .active > a:hover { +.tabs-below > .nav-tabs > .active > a:hover, +.tabs-below > .nav-tabs > .active > a:focus { border-color: transparent #ddd #ddd #ddd; } .tabs-left > .nav-tabs > li, @@ -2477,11 +3183,13 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px; } -.tabs-left > .nav-tabs > li > a:hover { +.tabs-left > .nav-tabs > li > a:hover, +.tabs-left > .nav-tabs > li > a:focus { border-color: #eeeeee #dddddd #eeeeee #eeeeee; } .tabs-left > .nav-tabs .active > a, -.tabs-left > .nav-tabs .active > a:hover { +.tabs-left > .nav-tabs .active > a:hover, +.tabs-left > .nav-tabs .active > a:focus { border-color: #ddd transparent #ddd #ddd; *border-right-color: #ffffff; } @@ -2496,78 +3204,110 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; } -.tabs-right > .nav-tabs > li > a:hover { +.tabs-right > .nav-tabs > li > a:hover, +.tabs-right > .nav-tabs > li > a:focus { border-color: #eeeeee #eeeeee #eeeeee #dddddd; } .tabs-right > .nav-tabs .active > a, -.tabs-right > .nav-tabs .active > a:hover { +.tabs-right > .nav-tabs .active > a:hover, +.tabs-right > .nav-tabs .active > a:focus { border-color: #ddd #ddd #ddd transparent; *border-left-color: #ffffff; } +.nav > .disabled > a { + color: #999999; +} +.nav > .disabled > a:hover, +.nav > .disabled > a:focus { + text-decoration: none; + background-color: transparent; + cursor: default; +} .navbar { + overflow: visible; + margin-bottom: 20px; *position: relative; *z-index: 2; - overflow: visible; - margin-bottom: 18px; } .navbar-inner { min-height: 40px; padding-left: 20px; padding-right: 20px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); + background-color: #fafafa; + background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2)); + background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2); + background-image: -o-linear-gradient(top, #ffffff, #f2f2f2); + background-image: linear-gradient(to bottom, #ffffff, #f2f2f2); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); + border: 1px solid #d4d4d4; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); - -moz-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); - box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); + *zoom: 1; +} +.navbar-inner:before, +.navbar-inner:after { + display: table; + content: ""; + line-height: 0; +} +.navbar-inner:after { + clear: both; } .navbar .container { width: auto; } .nav-collapse.collapse { height: auto; -} -.navbar { - color: #999999; -} -.navbar .brand:hover { - text-decoration: none; + overflow: visible; } .navbar .brand { float: left; display: block; - padding: 8px 20px 12px; + padding: 10px 20px 10px; margin-left: -20px; font-size: 20px; font-weight: 200; - line-height: 1; - color: #999999; + color: #777777; + text-shadow: 0 1px 0 #ffffff; +} +.navbar .brand:hover, +.navbar .brand:focus { + text-decoration: none; } -.navbar .navbar-text { +.navbar-text { margin-bottom: 0; line-height: 40px; + color: #777777; } -.navbar .navbar-link { - color: #999999; +.navbar-link { + color: #777777; } -.navbar .navbar-link:hover { - color: #ffffff; +.navbar-link:hover, +.navbar-link:focus { + color: #333333; +} +.navbar .divider-vertical { + height: 40px; + margin: 0 9px; + border-left: 1px solid #f2f2f2; + border-right: 1px solid #ffffff; } .navbar .btn, .navbar .btn-group { margin-top: 5px; } -.navbar .btn-group .btn { - margin: 0; +.navbar .btn-group .btn, +.navbar .input-prepend .btn, +.navbar .input-append .btn, +.navbar .input-prepend .btn-group, +.navbar .input-append .btn-group { + margin-top: 0; } .navbar-form { margin-bottom: 0; @@ -2577,6 +3317,7 @@ input[type="submit"].btn.btn-mini { .navbar-form:after { display: table; content: ""; + line-height: 0; } .navbar-form:after { clear: both; @@ -2588,7 +3329,8 @@ input[type="submit"].btn.btn-mini { margin-top: 5px; } .navbar-form input, -.navbar-form select { +.navbar-form select, +.navbar-form .btn { display: inline-block; margin-bottom: 0; } @@ -2599,7 +3341,7 @@ input[type="submit"].btn.btn-mini { } .navbar-form .input-append, .navbar-form .input-prepend { - margin-top: 6px; + margin-top: 5px; white-space: nowrap; } .navbar-form .input-append input, @@ -2609,44 +3351,28 @@ input[type="submit"].btn.btn-mini { .navbar-search { position: relative; float: left; - margin-top: 6px; + margin-top: 5px; margin-bottom: 0; } .navbar-search .search-query { - padding: 4px 9px; + margin-bottom: 0; + padding: 4px 14px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 1; - color: #ffffff; - background-color: #626262; - border: 1px solid #151515; - -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - -webkit-transition: none; - -moz-transition: none; - -ms-transition: none; - -o-transition: none; - transition: none; -} -.navbar-search .search-query:-moz-placeholder { - color: #cccccc; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; } -.navbar-search .search-query::-webkit-input-placeholder { - color: #cccccc; +.navbar-static-top { + position: static; + margin-bottom: 0; } -.navbar-search .search-query:focus, -.navbar-search .search-query.focused { - padding: 5px 10px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - outline: 0; +.navbar-static-top .navbar-inner { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .navbar-fixed-top, .navbar-fixed-bottom { @@ -2657,6 +3383,13 @@ input[type="submit"].btn.btn-mini { margin-bottom: 0; } .navbar-fixed-top .navbar-inner, +.navbar-static-top .navbar-inner { + border-width: 0 0 1px; +} +.navbar-fixed-bottom .navbar-inner { + border-width: 1px 0 0; +} +.navbar-fixed-top .navbar-inner, .navbar-fixed-bottom .navbar-inner { padding-left: 0; padding-right: 0; @@ -2664,6 +3397,7 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0; border-radius: 0; } +.navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 940px; @@ -2671,9 +3405,20 @@ input[type="submit"].btn.btn-mini { .navbar-fixed-top { top: 0; } +.navbar-fixed-top .navbar-inner, +.navbar-static-top .navbar-inner { + -webkit-box-shadow: 0 1px 10px rgba(0,0,0,.1); + -moz-box-shadow: 0 1px 10px rgba(0,0,0,.1); + box-shadow: 0 1px 10px rgba(0,0,0,.1); +} .navbar-fixed-bottom { bottom: 0; } +.navbar-fixed-bottom .navbar-inner { + -webkit-box-shadow: 0 -1px 10px rgba(0,0,0,.1); + -moz-box-shadow: 0 -1px 10px rgba(0,0,0,.1); + box-shadow: 0 -1px 10px rgba(0,0,0,.1); +} .navbar .nav { position: relative; left: 0; @@ -2683,51 +3428,36 @@ input[type="submit"].btn.btn-mini { } .navbar .nav.pull-right { float: right; + margin-right: 0; } .navbar .nav > li { - display: block; float: left; } .navbar .nav > li > a { float: none; - padding: 9px 10px 11px; - line-height: 19px; - color: #999999; + padding: 10px 15px 10px; + color: #777777; text-decoration: none; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.navbar .btn { - display: inline-block; - padding: 4px 10px 4px; - margin: 5px 5px 6px; - line-height: 18px; + text-shadow: 0 1px 0 #ffffff; } -.navbar .btn-group { - margin: 0; - padding: 5px 5px 6px; +.navbar .nav .dropdown-toggle .caret { + margin-top: 8px; } +.navbar .nav > li > a:focus, .navbar .nav > li > a:hover { background-color: transparent; - color: #ffffff; + color: #333333; text-decoration: none; } -.navbar .nav .active > a, -.navbar .nav .active > a:hover { - color: #ffffff; +.navbar .nav > .active > a, +.navbar .nav > .active > a:hover, +.navbar .nav > .active > a:focus { + color: #555555; text-decoration: none; - background-color: #222222; -} -.navbar .divider-vertical { - height: 40px; - width: 1px; - margin: 0 9px; - overflow: hidden; - background-color: #222222; - border-right: 1px solid #333333; -} -.navbar .nav.pull-right { - margin-left: 10px; - margin-right: 0; + background-color: #e5e5e5; + -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); } .navbar .btn-navbar { display: none; @@ -2735,18 +3465,19 @@ input[type="submit"].btn.btn-mini { padding: 7px 10px; margin-left: 5px; margin-right: 5px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #ededed; + background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5)); + background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5); + background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5); + background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - border-color: #222222 #222222 #000000; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); + border-color: #e5e5e5 #e5e5e5 #bfbfbf; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #222222; + *background-color: #e5e5e5; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2755,16 +3486,18 @@ input[type="submit"].btn.btn-mini { box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); } .navbar .btn-navbar:hover, +.navbar .btn-navbar:focus, .navbar .btn-navbar:active, .navbar .btn-navbar.active, .navbar .btn-navbar.disabled, .navbar .btn-navbar[disabled] { - background-color: #222222; - *background-color: #151515; + color: #ffffff; + background-color: #e5e5e5; + *background-color: #d9d9d9; } .navbar .btn-navbar:active, .navbar .btn-navbar.active { - background-color: #080808 \9; + background-color: #cccccc \9; } .navbar .btn-navbar .icon-bar { display: block; @@ -2781,7 +3514,7 @@ input[type="submit"].btn.btn-mini { .btn-navbar .icon-bar + .icon-bar { margin-top: 3px; } -.navbar .dropdown-menu:before { +.navbar .nav > li > .dropdown-menu:before { content: ''; display: inline-block; border-left: 7px solid transparent; @@ -2792,7 +3525,7 @@ input[type="submit"].btn.btn-mini { top: -7px; left: 9px; } -.navbar .dropdown-menu:after { +.navbar .nav > li > .dropdown-menu:after { content: ''; display: inline-block; border-left: 6px solid transparent; @@ -2802,142 +3535,293 @@ input[type="submit"].btn.btn-mini { top: -6px; left: 10px; } -.navbar-fixed-bottom .dropdown-menu:before { +.navbar-fixed-bottom .nav > li > .dropdown-menu:before { border-top: 7px solid #ccc; border-top-color: rgba(0, 0, 0, 0.2); border-bottom: 0; bottom: -7px; top: auto; } -.navbar-fixed-bottom .dropdown-menu:after { +.navbar-fixed-bottom .nav > li > .dropdown-menu:after { border-top: 6px solid #ffffff; border-bottom: 0; bottom: -6px; top: auto; } -.navbar .nav li.dropdown .dropdown-toggle .caret, -.navbar .nav li.dropdown.open .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} -.navbar .nav li.dropdown.active .caret { - opacity: 1; - filter: alpha(opacity=100); +.navbar .nav li.dropdown > a:hover .caret, +.navbar .nav li.dropdown > a:focus .caret { + border-top-color: #333333; + border-bottom-color: #333333; } .navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.open.active > .dropdown-toggle { - background-color: transparent; + background-color: #e5e5e5; + color: #555555; } -.navbar .nav li.dropdown.active > .dropdown-toggle:hover { - color: #ffffff; +.navbar .nav li.dropdown > .dropdown-toggle .caret { + border-top-color: #777777; + border-bottom-color: #777777; +} +.navbar .nav li.dropdown.open > .dropdown-toggle .caret, +.navbar .nav li.dropdown.active > .dropdown-toggle .caret, +.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret { + border-top-color: #555555; + border-bottom-color: #555555; } -.navbar .pull-right .dropdown-menu, -.navbar .dropdown-menu.pull-right { +.navbar .pull-right > li > .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right { left: auto; right: 0; } -.navbar .pull-right .dropdown-menu:before, -.navbar .dropdown-menu.pull-right:before { +.navbar .pull-right > li > .dropdown-menu:before, +.navbar .nav > li > .dropdown-menu.pull-right:before { left: auto; right: 12px; } -.navbar .pull-right .dropdown-menu:after, -.navbar .dropdown-menu.pull-right:after { +.navbar .pull-right > li > .dropdown-menu:after, +.navbar .nav > li > .dropdown-menu.pull-right:after { left: auto; right: 13px; } -.breadcrumb { - padding: 7px 14px; - margin: 0 0 18px; - list-style: none; - background-color: #fbfbfb; - background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5)); - background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); - background-image: linear-gradient(top, #ffffff, #f5f5f5); +.navbar .pull-right > li > .dropdown-menu .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu { + left: auto; + right: 100%; + margin-left: 0; + margin-right: -1px; + -webkit-border-radius: 6px 0 6px 6px; + -moz-border-radius: 6px 0 6px 6px; + border-radius: 6px 0 6px 6px; +} +.navbar-inverse .navbar-inner { + background-color: #1b1b1b; + background-image: -moz-linear-gradient(top, #222222, #111111); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111)); + background-image: -webkit-linear-gradient(top, #222222, #111111); + background-image: -o-linear-gradient(top, #222222, #111111); + background-image: linear-gradient(to bottom, #222222, #111111); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); - border: 1px solid #ddd; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; -} -.breadcrumb li { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - text-shadow: 0 1px 0 #ffffff; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0); + border-color: #252525; } -.breadcrumb .divider { - padding: 0 5px; +.navbar-inverse .brand, +.navbar-inverse .nav > li > a { color: #999999; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } -.breadcrumb .active a { - color: #333333; -} -.pagination { - height: 36px; - margin: 18px 0; +.navbar-inverse .brand:hover, +.navbar-inverse .nav > li > a:hover, +.navbar-inverse .brand:focus, +.navbar-inverse .nav > li > a:focus { + color: #ffffff; } -.pagination ul { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - margin-left: 0; - margin-bottom: 0; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); +.navbar-inverse .brand { + color: #999999; } -.pagination li { - display: inline; +.navbar-inverse .navbar-text { + color: #999999; } -.pagination a { +.navbar-inverse .nav > li > a:focus, +.navbar-inverse .nav > li > a:hover { + background-color: transparent; + color: #ffffff; +} +.navbar-inverse .nav .active > a, +.navbar-inverse .nav .active > a:hover, +.navbar-inverse .nav .active > a:focus { + color: #ffffff; + background-color: #111111; +} +.navbar-inverse .navbar-link { + color: #999999; +} +.navbar-inverse .navbar-link:hover, +.navbar-inverse .navbar-link:focus { + color: #ffffff; +} +.navbar-inverse .divider-vertical { + border-left-color: #111111; + border-right-color: #222222; +} +.navbar-inverse .nav li.dropdown.open > .dropdown-toggle, +.navbar-inverse .nav li.dropdown.active > .dropdown-toggle, +.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle { + background-color: #111111; + color: #ffffff; +} +.navbar-inverse .nav li.dropdown > a:hover .caret, +.navbar-inverse .nav li.dropdown > a:focus .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; +} +.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret { + border-top-color: #999999; + border-bottom-color: #999999; +} +.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, +.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret, +.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; +} +.navbar-inverse .navbar-search .search-query { + color: #ffffff; + background-color: #515151; + border-color: #111111; + -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + -webkit-transition: none; + -moz-transition: none; + -o-transition: none; + transition: none; +} +.navbar-inverse .navbar-search .search-query:-moz-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query:-ms-input-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder { + color: #cccccc; +} +.navbar-inverse .navbar-search .search-query:focus, +.navbar-inverse .navbar-search .search-query.focused { + padding: 5px 15px; + color: #333333; + text-shadow: 0 1px 0 #ffffff; + background-color: #ffffff; + border: 0; + -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + outline: 0; +} +.navbar-inverse .btn-navbar { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #0e0e0e; + background-image: -moz-linear-gradient(top, #151515, #040404); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404)); + background-image: -webkit-linear-gradient(top, #151515, #040404); + background-image: -o-linear-gradient(top, #151515, #040404); + background-image: linear-gradient(to bottom, #151515, #040404); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0); + border-color: #040404 #040404 #000000; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + *background-color: #040404; + /* Darken IE7 buttons by default so they stand out more given they won't have borders */ + + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +} +.navbar-inverse .btn-navbar:hover, +.navbar-inverse .btn-navbar:focus, +.navbar-inverse .btn-navbar:active, +.navbar-inverse .btn-navbar.active, +.navbar-inverse .btn-navbar.disabled, +.navbar-inverse .btn-navbar[disabled] { + color: #ffffff; + background-color: #040404; + *background-color: #000000; +} +.navbar-inverse .btn-navbar:active, +.navbar-inverse .btn-navbar.active { + background-color: #000000 \9; +} +.breadcrumb { + padding: 8px 15px; + margin: 0 0 20px; + list-style: none; + background-color: #f5f5f5; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.breadcrumb > li { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + text-shadow: 0 1px 0 #ffffff; +} +.breadcrumb > li > .divider { + padding: 0 5px; + color: #ccc; +} +.breadcrumb > .active { + color: #999999; +} +.pagination { + margin: 20px 0; +} +.pagination ul { + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; + margin-left: 0; + margin-bottom: 0; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); +} +.pagination ul > li { + display: inline; +} +.pagination ul > li > a, +.pagination ul > li > span { float: left; - padding: 0 14px; - line-height: 34px; + padding: 4px 12px; + line-height: 20px; text-decoration: none; - border: 1px solid #ddd; + background-color: #ffffff; + border: 1px solid #dddddd; border-left-width: 0; } -.pagination a:hover, -.pagination .active a { +.pagination ul > li > a:hover, +.pagination ul > li > a:focus, +.pagination ul > .active > a, +.pagination ul > .active > span { background-color: #f5f5f5; } -.pagination .active a { +.pagination ul > .active > a, +.pagination ul > .active > span { color: #999999; cursor: default; } -.pagination .disabled span, -.pagination .disabled a, -.pagination .disabled a:hover { +.pagination ul > .disabled > span, +.pagination ul > .disabled > a, +.pagination ul > .disabled > a:hover, +.pagination ul > .disabled > a:focus { color: #999999; background-color: transparent; cursor: default; } -.pagination li:first-child a { +.pagination ul > li:first-child > a, +.pagination ul > li:first-child > span { border-left-width: 1px; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } -.pagination li:last-child a { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; +.pagination ul > li:last-child > a, +.pagination ul > li:last-child > span { + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; } .pagination-centered { text-align: center; @@ -2945,9 +3829,63 @@ input[type="submit"].btn.btn-mini { .pagination-right { text-align: right; } +.pagination-large ul > li > a, +.pagination-large ul > li > span { + padding: 11px 19px; + font-size: 17.5px; +} +.pagination-large ul > li:first-child > a, +.pagination-large ul > li:first-child > span { + -webkit-border-top-left-radius: 6px; + -moz-border-radius-topleft: 6px; + border-top-left-radius: 6px; + -webkit-border-bottom-left-radius: 6px; + -moz-border-radius-bottomleft: 6px; + border-bottom-left-radius: 6px; +} +.pagination-large ul > li:last-child > a, +.pagination-large ul > li:last-child > span { + -webkit-border-top-right-radius: 6px; + -moz-border-radius-topright: 6px; + border-top-right-radius: 6px; + -webkit-border-bottom-right-radius: 6px; + -moz-border-radius-bottomright: 6px; + border-bottom-right-radius: 6px; +} +.pagination-mini ul > li:first-child > a, +.pagination-small ul > li:first-child > a, +.pagination-mini ul > li:first-child > span, +.pagination-small ul > li:first-child > span { + -webkit-border-top-left-radius: 3px; + -moz-border-radius-topleft: 3px; + border-top-left-radius: 3px; + -webkit-border-bottom-left-radius: 3px; + -moz-border-radius-bottomleft: 3px; + border-bottom-left-radius: 3px; +} +.pagination-mini ul > li:last-child > a, +.pagination-small ul > li:last-child > a, +.pagination-mini ul > li:last-child > span, +.pagination-small ul > li:last-child > span { + -webkit-border-top-right-radius: 3px; + -moz-border-radius-topright: 3px; + border-top-right-radius: 3px; + -webkit-border-bottom-right-radius: 3px; + -moz-border-radius-bottomright: 3px; + border-bottom-right-radius: 3px; +} +.pagination-small ul > li > a, +.pagination-small ul > li > span { + padding: 2px 10px; + font-size: 11.9px; +} +.pagination-mini ul > li > a, +.pagination-mini ul > li > span { + padding: 0 6px; + font-size: 10.5px; +} .pager { - margin-left: 0; - margin-bottom: 18px; + margin: 20px 0; list-style: none; text-align: center; *zoom: 1; @@ -2956,6 +3894,7 @@ input[type="submit"].btn.btn-mini { .pager:after { display: table; content: ""; + line-height: 0; } .pager:after { clear: both; @@ -2963,7 +3902,8 @@ input[type="submit"].btn.btn-mini { .pager li { display: inline; } -.pager a { +.pager li > a, +.pager li > span { display: inline-block; padding: 5px 14px; background-color: #fff; @@ -2972,34 +3912,27 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 15px; border-radius: 15px; } -.pager a:hover { +.pager li > a:hover, +.pager li > a:focus { text-decoration: none; background-color: #f5f5f5; } -.pager .next a { +.pager .next > a, +.pager .next > span { float: right; } -.pager .previous a { +.pager .previous > a, +.pager .previous > span { float: left; } -.pager .disabled a, -.pager .disabled a:hover { +.pager .disabled > a, +.pager .disabled > a:hover, +.pager .disabled > a:focus, +.pager .disabled > span { color: #999999; background-color: #fff; cursor: default; } -.modal-open .dropdown-menu { - z-index: 2050; -} -.modal-open .dropdown.open { - *z-index: 2050; -} -.modal-open .popover { - z-index: 2060; -} -.modal-open .tooltip { - z-index: 2070; -} .modal-backdrop { position: fixed; top: 0; @@ -3019,12 +3952,11 @@ input[type="submit"].btn.btn-mini { } .modal { position: fixed; - top: 50%; + top: 10%; left: 50%; z-index: 1050; - overflow: auto; width: 560px; - margin: -250px 0 0 -280px; + margin-left: -280px; background-color: #ffffff; border: 1px solid #999; border: 1px solid rgba(0, 0, 0, 0.3); @@ -3040,17 +3972,17 @@ input[type="submit"].btn.btn-mini { -webkit-background-clip: padding-box; -moz-background-clip: padding-box; background-clip: padding-box; + outline: none; } .modal.fade { -webkit-transition: opacity .3s linear, top .3s ease-out; -moz-transition: opacity .3s linear, top .3s ease-out; - -ms-transition: opacity .3s linear, top .3s ease-out; -o-transition: opacity .3s linear, top .3s ease-out; transition: opacity .3s linear, top .3s ease-out; top: -25%; } .modal.fade.in { - top: 50%; + top: 10%; } .modal-header { padding: 9px 15px; @@ -3059,7 +3991,12 @@ input[type="submit"].btn.btn-mini { .modal-header .close { margin-top: 2px; } +.modal-header h3 { + margin: 0; + line-height: 30px; +} .modal-body { + position: relative; overflow-y: auto; max-height: 400px; padding: 15px; @@ -3085,6 +4022,7 @@ input[type="submit"].btn.btn-mini { .modal-footer:after { display: table; content: ""; + line-height: 0; } .modal-footer:after { clear: both; @@ -3096,13 +4034,16 @@ input[type="submit"].btn.btn-mini { .modal-footer .btn-group .btn + .btn { margin-left: -1px; } +.modal-footer .btn-block + .btn-block { + margin-left: 0; +} .tooltip { position: absolute; - z-index: 1020; + z-index: 1030; display: block; visibility: visible; - padding: 5px; font-size: 11px; + line-height: 1.4; opacity: 0; filter: alpha(opacity=0); } @@ -3111,52 +4052,24 @@ input[type="submit"].btn.btn-mini { filter: alpha(opacity=80); } .tooltip.top { - margin-top: -2px; + margin-top: -3px; + padding: 5px 0; } .tooltip.right { - margin-left: 2px; + margin-left: 3px; + padding: 0 5px; } .tooltip.bottom { - margin-top: 2px; + margin-top: 3px; + padding: 5px 0; } .tooltip.left { - margin-left: -2px; -} -.tooltip.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; -} -.tooltip.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.tooltip.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; -} -.tooltip.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; + margin-left: -3px; + padding: 0 5px; } .tooltip-inner { max-width: 200px; - padding: 3px 8px; + padding: 8px; color: #ffffff; text-align: center; text-decoration: none; @@ -3169,100 +4082,36 @@ input[type="submit"].btn.btn-mini { position: absolute; width: 0; height: 0; + border-color: transparent; + border-style: solid; } -.popover { - position: absolute; - top: 0; - left: 0; - z-index: 1010; - display: none; - padding: 5px; -} -.popover.top { - margin-top: -5px; -} -.popover.right { - margin-left: 5px; -} -.popover.bottom { - margin-top: 5px; -} -.popover.left { - margin-left: -5px; -} -.popover.top .arrow { +.tooltip.top .tooltip-arrow { bottom: 0; left: 50%; margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; + border-width: 5px 5px 0; + border-top-color: #000000; } -.popover.right .arrow { +.tooltip.right .tooltip-arrow { top: 50%; left: 0; margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; -} -.popover.bottom .arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; + border-width: 5px 5px 5px 0; + border-right-color: #000000; } -.popover.left .arrow { +.tooltip.left .tooltip-arrow { top: 50%; right: 0; margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.popover .arrow { - position: absolute; - width: 0; - height: 0; -} -.popover-inner { - padding: 3px; - width: 280px; - overflow: hidden; - background: #000000; - background: rgba(0, 0, 0, 0.8); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -} -.popover-title { - padding: 9px 15px; - line-height: 1; - background-color: #f5f5f5; - border-bottom: 1px solid #eee; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; -} -.popover-content { - padding: 14px; - background-color: #ffffff; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; + border-width: 5px 0 5px 5px; + border-left-color: #000000; } -.popover-content p, -.popover-content ul, -.popover-content ol { - margin-bottom: 0; +.tooltip.bottom .tooltip-arrow { + top: 0; + left: 50%; + margin-left: -5px; + border-width: 0 5px 5px; + border-bottom-color: #000000; } .thumbnails { margin-left: -20px; @@ -3273,6 +4122,7 @@ input[type="submit"].btn.btn-mini { .thumbnails:after { display: table; content: ""; + line-height: 0; } .thumbnails:after { clear: both; @@ -3282,23 +4132,28 @@ input[type="submit"].btn.btn-mini { } .thumbnails > li { float: left; - margin-bottom: 18px; + margin-bottom: 20px; margin-left: 20px; } .thumbnail { display: block; padding: 4px; - line-height: 1; + line-height: 20px; border: 1px solid #ddd; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); -} -a.thumbnail:hover { - border-color: #b50909; + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +a.thumbnail:hover, +a.thumbnail:focus { + border-color: #c14531; -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); @@ -3311,10 +4166,13 @@ a.thumbnail:hover { } .thumbnail .caption { padding: 9px; + color: #555555; } .label, .badge { - font-size: 10.998px; + display: inline-block; + padding: 2px 4px; + font-size: 11.844px; font-weight: bold; line-height: 14px; color: #ffffff; @@ -3324,19 +4182,25 @@ a.thumbnail:hover { background-color: #999999; } .label { - padding: 1px 4px 2px; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } .badge { - padding: 1px 9px 2px; + padding-left: 9px; + padding-right: 9px; -webkit-border-radius: 9px; -moz-border-radius: 9px; border-radius: 9px; } +.label:empty, +.badge:empty { + display: none; +} a.label:hover, -a.badge:hover { +a.label:focus, +a.badge:hover, +a.badge:focus { color: #ffffff; text-decoration: none; cursor: pointer; @@ -3381,9 +4245,18 @@ a.badge:hover { .badge-inverse[href] { background-color: #1a1a1a; } -@-webkit-keyframes progress-bar-stripes { - from { - background-position: 40px 0; +.btn .label, +.btn .badge { + position: relative; + top: -1px; +} +.btn-mini .label, +.btn-mini .badge { + top: 0; +} +@-webkit-keyframes progress-bar-stripes { + from { + background-position: 40px 0; } to { background-position: 0 0; @@ -3423,17 +4296,16 @@ a.badge:hover { } .progress { overflow: hidden; - height: 18px; - margin-bottom: 18px; + height: 20px; + margin-bottom: 20px; background-color: #f7f7f7; background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0); -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); @@ -3443,41 +4315,43 @@ a.badge:hover { } .progress .bar { width: 0%; - height: 18px; + height: 100%; color: #ffffff; + float: left; font-size: 12px; text-align: center; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #0e90d2; background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -ms-linear-gradient(top, #149bdf, #0480be); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); background-image: -webkit-linear-gradient(top, #149bdf, #0480be); background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(top, #149bdf, #0480be); + background-image: linear-gradient(to bottom, #149bdf, #0480be); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; -webkit-transition: width 0.6s ease; -moz-transition: width 0.6s ease; - -ms-transition: width 0.6s ease; -o-transition: width 0.6s ease; transition: width 0.6s ease; } +.progress .bar + .bar { + -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); + -moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); + box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); +} .progress-striped .bar { background-color: #149bdf; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -webkit-background-size: 40px 40px; -moz-background-size: 40px 40px; -o-background-size: 40px 40px; @@ -3490,88 +4364,88 @@ a.badge:hover { -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; } -.progress-danger .bar { +.progress-danger .bar, +.progress .bar-danger { background-color: #dd514c; background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(top, #ee5f5b, #c43c35); + background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0); } -.progress-danger.progress-striped .bar { +.progress-danger.progress-striped .bar, +.progress-striped .bar-danger { background-color: #ee5f5b; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-success .bar { +.progress-success .bar, +.progress .bar-success { background-color: #5eb95e; background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); background-image: -webkit-linear-gradient(top, #62c462, #57a957); background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); + background-image: linear-gradient(to bottom, #62c462, #57a957); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0); } -.progress-success.progress-striped .bar { +.progress-success.progress-striped .bar, +.progress-striped .bar-success { background-color: #62c462; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-info .bar { +.progress-info .bar, +.progress .bar-info { background-color: #4bb1cf; background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(top, #5bc0de, #339bb9); + background-image: linear-gradient(to bottom, #5bc0de, #339bb9); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0); } -.progress-info.progress-striped .bar { +.progress-info.progress-striped .bar, +.progress-striped .bar-info { background-color: #5bc0de; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress-warning .bar { +.progress-warning .bar, +.progress .bar-warning { background-color: #faa732; background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-linear-gradient(top, #fbb450, #f89406); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); background-image: -webkit-linear-gradient(top, #fbb450, #f89406); background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(top, #fbb450, #f89406); + background-image: linear-gradient(to bottom, #fbb450, #f89406); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); } -.progress-warning.progress-striped .bar { +.progress-warning.progress-striped .bar, +.progress-striped .bar-warning { background-color: #fbb450; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .accordion { - margin-bottom: 18px; + margin-bottom: 20px; } .accordion-group { margin-bottom: 2px; @@ -3596,7 +4470,7 @@ a.badge:hover { } .carousel { position: relative; - margin-bottom: 18px; + margin-bottom: 20px; line-height: 1; } .carousel-inner { @@ -3604,47 +4478,47 @@ a.badge:hover { width: 100%; position: relative; } -.carousel .item { +.carousel-inner > .item { display: none; position: relative; -webkit-transition: 0.6s ease-in-out left; -moz-transition: 0.6s ease-in-out left; - -ms-transition: 0.6s ease-in-out left; -o-transition: 0.6s ease-in-out left; transition: 0.6s ease-in-out left; } -.carousel .item > img { +.carousel-inner > .item > img, +.carousel-inner > .item > a > img { display: block; line-height: 1; } -.carousel .active, -.carousel .next, -.carousel .prev { +.carousel-inner > .active, +.carousel-inner > .next, +.carousel-inner > .prev { display: block; } -.carousel .active { +.carousel-inner > .active { left: 0; } -.carousel .next, -.carousel .prev { +.carousel-inner > .next, +.carousel-inner > .prev { position: absolute; top: 0; width: 100%; } -.carousel .next { +.carousel-inner > .next { left: 100%; } -.carousel .prev { +.carousel-inner > .prev { left: -100%; } -.carousel .next.left, -.carousel .prev.right { +.carousel-inner > .next.left, +.carousel-inner > .prev.right { left: 0; } -.carousel .active.left { +.carousel-inner > .active.left { left: -100%; } -.carousel .active.right { +.carousel-inner > .active.right { left: 100%; } .carousel-control { @@ -3671,28 +4545,62 @@ a.badge:hover { left: auto; right: 15px; } -.carousel-control:hover { +.carousel-control:hover, +.carousel-control:focus { color: #ffffff; text-decoration: none; opacity: 0.9; filter: alpha(opacity=90); } +.carousel-indicators { + position: absolute; + top: 15px; + right: 15px; + z-index: 5; + margin: 0; + list-style: none; +} +.carousel-indicators li { + display: block; + float: left; + width: 10px; + height: 10px; + margin-left: 5px; + text-indent: -999px; + background-color: #ccc; + background-color: rgba(255, 255, 255, 0.25); + border-radius: 5px; +} +.carousel-indicators .active { + background-color: #fff; +} .carousel-caption { position: absolute; left: 0; right: 0; bottom: 0; - padding: 10px 15px 5px; + padding: 15px; background: #333333; background: rgba(0, 0, 0, 0.75); } .carousel-caption h4, .carousel-caption p { color: #ffffff; + line-height: 20px; +} +.carousel-caption h4 { + margin: 0 0 5px; +} +.carousel-caption p { + margin-bottom: 0; } .hero-unit { padding: 60px; margin-bottom: 30px; + font-size: 18px; + font-weight: 200; + line-height: 30px; + color: inherit; background-color: #eeeeee; -webkit-border-radius: 6px; -moz-border-radius: 6px; @@ -3705,1500 +4613,2030 @@ a.badge:hover { color: inherit; letter-spacing: -1px; } -.hero-unit p { - font-size: 18px; - font-weight: 200; - line-height: 27px; - color: inherit; -} -.pull-right { - float: right; -} -.pull-left { - float: left; +.hero-unit li { + line-height: 30px; } -.hide { +.popover { + position: absolute; + top: 0; + left: 0; + z-index: 1010; display: none; + max-width: 276px; + padding: 1px; + text-align: left; + background-color: #ffffff; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + white-space: normal; } -.show { - display: block; +.popover.top { + margin-top: -10px; } -.invisible { - visibility: hidden; +.popover.right { + margin-left: 10px; } -/* Font Awesome - the iconic font designed for use with Twitter Bootstrap - ------------------------------------------------------- - The full suite of pictographic icons, examples, and documentation - can be found at: http://fortawesome.github.com/Font-Awesome/ - - License - ------------------------------------------------------- - The Font Awesome webfont, CSS, and LESS files are licensed under CC BY 3.0: - http://creativecommons.org/licenses/by/3.0/ A mention of - 'Font Awesome - http://fortawesome.github.com/Font-Awesome' in human-readable - source code is considered acceptable attribution (most common on the web). - If human readable source code is not available to the end user, a mention in - an 'About' or 'Credits' screen is considered acceptable (most common in desktop - or mobile software). - - Contact - ------------------------------------------------------- - Email: dave@davegandy.com - Twitter: http://twitter.com/fortaweso_me - Work: Lead Product Designer @ http://kyruus.com - - */ -@font-face { - font-family: 'FontAwesome'; - src: url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.eot'); - src: url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.woff') format('woff'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.ttf') format('truetype'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.svg#FontAwesome') format('svg'); - font-weight: normal; - font-style: normal; +.popover.bottom { + margin-top: 10px; } -/* Font Awesome styles - ------------------------------------------------------- */ -[class^="icon-"]:before, -[class*=" icon-"]:before { - font-family: FontAwesome; +.popover.left { + margin-left: -10px; +} +.popover-title { + margin: 0; + padding: 8px 14px; + font-size: 14px; font-weight: normal; - font-style: normal; - display: inline-block; - text-decoration: inherit; + line-height: 18px; + background-color: #f7f7f7; + border-bottom: 1px solid #ebebeb; + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; } -a [class^="icon-"], -a [class*=" icon-"] { - display: inline-block; - text-decoration: inherit; +.popover-title:empty { + display: none; } -/* makes the font 33% larger relative to the icon container */ -.icon-large:before { - vertical-align: middle; - font-size: 1.3333333333333333em; +.popover-content { + padding: 9px 14px; } -.btn [class^="icon-"], -.nav-tabs [class^="icon-"], -.btn [class*=" icon-"], -.nav-tabs [class*=" icon-"] { - /* keeps button heights with and without icons the same */ - - line-height: .9em; +.popover .arrow, +.popover .arrow:after { + position: absolute; + display: block; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; } -li [class^="icon-"], -li [class*=" icon-"] { - display: inline-block; - width: 1.25em; - text-align: center; +.popover .arrow { + border-width: 11px; } -li .icon-large:before, -li .icon-large:before { - /* 1.5 increased font size for icon-large * 1.25 width */ - - width: 1.875em; +.popover .arrow:after { + border-width: 10px; + content: ""; } -ul.icons { - list-style-type: none; - margin-left: 2em; - text-indent: -0.8em; +.popover.top .arrow { + left: 50%; + margin-left: -11px; + border-bottom-width: 0; + border-top-color: #999; + border-top-color: rgba(0, 0, 0, 0.25); + bottom: -11px; +} +.popover.top .arrow:after { + bottom: 1px; + margin-left: -10px; + border-bottom-width: 0; + border-top-color: #ffffff; } -ul.icons li [class^="icon-"], -ul.icons li [class*=" icon-"] { - width: .8em; +.popover.right .arrow { + top: 50%; + left: -11px; + margin-top: -11px; + border-left-width: 0; + border-right-color: #999; + border-right-color: rgba(0, 0, 0, 0.25); } -ul.icons li .icon-large:before, -ul.icons li .icon-large:before { - /* 1.5 increased font size for icon-large * 1.25 width */ - - vertical-align: initial; +.popover.right .arrow:after { + left: 1px; + bottom: -10px; + border-left-width: 0; + border-right-color: #ffffff; } -/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen - readers do not read off random characters that represent icons */ -.icon-glass:before { - content: "\f000"; +.popover.bottom .arrow { + left: 50%; + margin-left: -11px; + border-top-width: 0; + border-bottom-color: #999; + border-bottom-color: rgba(0, 0, 0, 0.25); + top: -11px; } -.icon-music:before { - content: "\f001"; +.popover.bottom .arrow:after { + top: 1px; + margin-left: -10px; + border-top-width: 0; + border-bottom-color: #ffffff; } -.icon-search:before { - content: "\f002"; +.popover.left .arrow { + top: 50%; + right: -11px; + margin-top: -11px; + border-right-width: 0; + border-left-color: #999; + border-left-color: rgba(0, 0, 0, 0.25); } -.icon-envelope:before { - content: "\f003"; +.popover.left .arrow:after { + right: 1px; + border-right-width: 0; + border-left-color: #ffffff; + bottom: -10px; } -.icon-heart:before { - content: "\f004"; +.pull-right { + float: right; } -.icon-star:before { - content: "\f005"; +.pull-left { + float: left; } -.icon-star-empty:before { - content: "\f006"; +.hide { + display: none; } -.icon-user:before { - content: "\f007"; +.show { + display: block; } -.icon-film:before { - content: "\f008"; +.invisible { + visibility: hidden; } -.icon-th-large:before { - content: "\f009"; +.affix { + position: fixed; } -.icon-th:before { - content: "\f00a"; +.tag { + display: inline-block; + margin-bottom: 4px; + color: #111111; + background-color: #f6f6f6; + padding: 1px 10px; + border: 1px solid #dddddd; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; + -webkit-box-shadow: inset 0 1px 0 #ffffff; + -moz-box-shadow: inset 0 1px 0 #ffffff; + box-shadow: inset 0 1px 0 #ffffff; } -.icon-th-list:before { - content: "\f00b"; +a.tag:hover { + text-decoration: none; + color: #fff; + background-color: #d36452; + border: 1px solid #c14531; + -webkit-box-shadow: inset 0 1px 0 #dd887b; + -moz-box-shadow: inset 0 1px 0 #dd887b; + box-shadow: inset 0 1px 0 #dd887b; } -.icon-ok:before { - content: "\f00c"; +.pill { + display: inline-block; + background-color: #6f8890; + color: #ffffff; + padding: 2px 10px 1px 10px; + margin-right: 5px; + font-weight: normal; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; } -.icon-remove:before { - content: "\f00d"; +.pill a { + color: #ffffff; } -.icon-zoom-in:before { - content: "\f00e"; +.pill a.remove { + font-size: 11px; } -.icon-zoom-out:before { - content: "\f010"; +.unstyled { + margin: 0; + list-style: none; } -.icon-off:before { - content: "\f011"; +.simple-item { + font-size: 12px; + line-height: 1.1666666666666667em; + padding: 7px 25px; + border-bottom: 1px dotted #dddddd; } -.icon-signal:before { - content: "\f012"; +.simple-item:last-of-type { + border-bottom: 0; } -.icon-cog:before { - content: "\f013"; +.simple-list { + *zoom: 1; + margin: 0; + list-style: none; } -.icon-trash:before { - content: "\f014"; +.simple-list:before, +.simple-list:after { + display: table; + content: ""; + line-height: 0; } -.icon-home:before { - content: "\f015"; +.simple-list:after { + clear: both; } -.icon-file:before { - content: "\f016"; +.simple-list > li { + font-size: 12px; + line-height: 1.1666666666666667em; + padding: 7px 25px; + border-bottom: 1px dotted #dddddd; } -.icon-time:before { - content: "\f017"; +.simple-list > li:last-of-type { + border-bottom: 0; } -.icon-road:before { - content: "\f018"; +.simple-list .ckan-icon { + position: relative; + top: 0px; } -.icon-download-alt:before { - content: "\f019"; +.module-narrow .simple-list > li { + padding-left: 15px; + padding-right: 15px; + position: relative; } -.icon-download:before { - content: "\f01a"; +.listing li { + text-align: right; + margin-bottom: 5px; } -.icon-upload:before { - content: "\f01b"; +.listing .key { + clear: right; + font-weight: bold; } -.icon-inbox:before { - content: "\f01c"; +.js .tab-content { + display: none; } -.icon-play-circle:before { - content: "\f01d"; +.js .tab-content.active { + display: block; } -.icon-repeat:before { - content: "\f01e"; +.box { + background-color: #FFF; + border: 1px solid #cccccc; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); } -/* \f020 doesn't work in Safari. all shifted one down */ -.icon-refresh:before { - content: "\f021"; +.module { + margin: 20px 0; } -.icon-list-alt:before { - content: "\f022"; +.module-heading { + *zoom: 1; + margin: 0; + padding: 7px 25px; + font-size: 14px; + line-height: 1.3; + background-color: #f6f6f6; + border-top: 1px solid #dddddd; + border-bottom: 1px solid #dddddd; } -.icon-lock:before { - content: "\f023"; +.module-heading:before, +.module-heading:after { + display: table; + content: ""; + line-height: 0; } -.icon-flag:before { - content: "\f024"; +.module-heading:after { + clear: both; } -.icon-headphones:before { - content: "\f025"; +.module-heading .action { + float: right; + color: #888888; + font-size: 12px; + line-height: 20px; + text-decoration: underline; } -.icon-volume-off:before { - content: "\f026"; +.module-heading .action:hover { + color: #444444; } -.icon-volume-down:before { - content: "\f027"; +.module-content { + padding: 0 25px; + margin: 20px 0; } -.icon-volume-up:before { - content: "\f028"; +.module-content:first-child { + margin-top: 0; + padding-top: 20px; } -.icon-qrcode:before { - content: "\f029"; +.module-content:last-child { + margin-bottom: 0; + padding-bottom: 20px; } -.icon-barcode:before { - content: "\f02a"; +.module-content > :last-child { + margin-bottom: 0; } -.icon-tag:before { - content: "\f02b"; +.module:first-child .module-heading { + -webkit-border-radius: 3px 0 0 0; + -moz-border-radius: 3px 0 0 0; + border-radius: 3px 0 0 0; + border-top-width: 0; } -.icon-tags:before { - content: "\f02c"; +.module:last-child { + margin-bottom: 20px; } -.icon-book:before { - content: "\f02d"; +.module-footer { + padding: 7px 25px 7px; + margin: 0; + border-top: 1px dotted #dddddd; } -.icon-bookmark:before { - content: "\f02e"; +.module .read-more { + font-weight: bold; + color: #000000; } -.icon-print:before { - content: "\f02f"; +.module .pagination { + height: 34px; + margin-bottom: 0; + border-top: 1px solid #dddddd; } -.icon-camera:before { - content: "\f030"; +.module-content .pagination { + margin-left: -25px; + margin-right: -25px; + margin-bottom: -20px; } -.icon-font:before { - content: "\f031"; +.module .pagination > ul { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + border: 0; } -.icon-bold:before { - content: "\f032"; +.module .pagination li a { + border-top: none; + border-bottom: none; + padding-top: 7px; + padding-bottom: 7px; } -.icon-italic:before { - content: "\f033"; +.module .pagination li:first-child a, +.module .pagination li:last-child a { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } -.icon-text-height:before { - content: "\f034"; +.module .pagination li:first-child a { + border-left-width: 0; } -.icon-text-width:before { - content: "\f035"; +.module .pagination li:last-child a { + border-right-width: 0; } -.icon-align-left:before { - content: "\f036"; +.module .pagination li.active a { + border-left-width: 1px; + border-right-width: 1px; } -.icon-align-center:before { - content: "\f037"; +.module-content-shallow { + padding: 0; + margin-top: 10px; + padding-bottom: 10px; } -.icon-align-right:before { - content: "\f038"; +.module h1 { + margin-bottom: 20px; } -.icon-align-justify:before { - content: "\f039"; +.module-shallow .module-content { + padding: 10px; + margin: 0; } -.icon-list:before { - content: "\f03a"; +.module-shallow .module-tags { + margin-top: 0; + margin-bottom: 0; } -.icon-indent-left:before { - content: "\f03b"; +.module-shallow .module-content:first-child { + padding-top: 10px; } -.icon-indent-right:before { - content: "\f03c"; +.module-shallow .module-content:last-child { + padding-bottom: 10px; } -.icon-facetime-video:before { - content: "\f03d"; +.module-narrow .module-heading, +.module-narrow .module-content, +.module-narrow .module-footer { + padding-left: 15px; + padding-right: 15px; } -.icon-picture:before { - content: "\f03e"; +.module-grid { + margin: 0; + list-style: none; + *zoom: 1; + margin: 0 -25px; + padding-bottom: 15px; + background: #fbfbfb url("../../../base/images/bg.png"); + border: 1px solid #dddddd; + border-width: 1px 0; } -.icon-pencil:before { - content: "\f040"; +.module-grid:before, +.module-grid:after { + display: table; + content: ""; + line-height: 0; } -.icon-map-marker:before { - content: "\f041"; +.module-grid:after { + clear: both; } -.icon-adjust:before { - content: "\f042"; +.module-item { + width: 189px; + padding: 15px; + margin: 15px 0 0 15px; + background-color: white; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + float: left; + margin-left: 20px; + width: 460px; + padding-top: 10px; + padding-bottom: 10px; + padding-right: 50px; + overflow: hidden; + position: relative; } -.icon-tint:before { - content: "\f043"; +.module-item span.count { + color: #999; } -.icon-edit:before { - content: "\f044"; +.module-item .media-image { + margin-bottom: 5px; } -.icon-share:before { - content: "\f045"; +.module-item .media-edit { + opacity: 0; + position: absolute; + right: 15px; + bottom: 15px; + -webkit-transition: opacity 0.2s ease-in; + -moz-transition: opacity 0.2s ease-in; + -o-transition: opacity 0.2s ease-in; + transition: opacity 0.2s ease-in; } -.icon-check:before { - content: "\f046"; +.module-item:hover { + z-index: 1; } -.icon-move:before { - content: "\f047"; +.module-item:hover .media-edit { + opacity: 1; } -.icon-step-backward:before { - content: "\f048"; +.module-item.first { + clear: left; } -.icon-fast-backward:before { - content: "\f049"; +.group .content img { + margin: 0 -5px 5px; + max-width: initial; } -.icon-backward:before { - content: "\f04a"; +.group .content h3 { + font-size: 14px; + line-height: 1.3; } -.icon-play:before { - content: "\f04b"; +.group-listing { + margin-left: -20px; } -.icon-pause:before { - content: "\f04c"; +.ckanext-datapreview { + position: relative; } -.icon-stop:before { - content: "\f04d"; +.ckanext-datapreview > iframe { + min-height: 400px; } -.icon-forward:before { - content: "\f04e"; +.ckanext-datapreview > img { + max-height: 500px; + max-width: 100%; + overflow: hidden; } -.icon-fast-forward:before { - content: "\f050"; +.package-info h4 { + margin-bottom: 10px; } -.icon-step-forward:before { - content: "\f051"; +.module-resource { + background-color: #ffffff; + border-bottom: 1px solid #dddddd; + margin-top: 0; + margin-bottom: 0; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } -.icon-eject:before { - content: "\f052"; +.module-resource .actions { + position: relative; + float: right; + top: -10px; + right: -15px; } -.icon-chevron-left:before { - content: "\f053"; +.module .module-tags { + padding-bottom: 8px; } -.icon-chevron-right:before { - content: "\f054"; +.secondary .module:first-child, +.primary .module:first-child { + margin-top: 0; } -.icon-plus-sign:before { - content: "\f055"; +.no-nav .module:last-child { + margin-top: 0; } -.icon-minus-sign:before { - content: "\f056"; +.module-image { + float: left; + width: 50px; + height: 50px; + line-height: 50px; + text-align: center; + margin-right: 15px; } -.icon-remove-sign:before { - content: "\f057"; +.module-image img { + max-width: 50px; + max-height: 50px; + vertical-align: middle; } -.icon-ok-sign:before { - content: "\f058"; +.banner { + -webkit-transform: rotate(45deg); + -moz-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); + -webkit-transform-origin: center center; + -moz-transform-origin: center center; + -ms-transform-origin: center center; + -o-transform-origin: center center; + transform-origin: center center; + position: absolute; + top: 15px; + right: -35px; + width: 80px; + color: #ffffff; + background-color: #c14531; + padding: 1px 20px; + font-size: 11px; + text-align: center; + text-transform: uppercase; } -.icon-question-sign:before { - content: "\f059"; +.media-grid { + margin: 0; + list-style: none; + *zoom: 1; + margin: 0 -25px; + padding-bottom: 15px; + background: #fbfbfb url("../../../base/images/bg.png"); + border: 1px solid #dddddd; + border-width: 1px 0; } -.icon-info-sign:before { - content: "\f05a"; +.media-grid:before, +.media-grid:after { + display: table; + content: ""; + line-height: 0; } -.icon-screenshot:before { - content: "\f05b"; +.media-grid:after { + clear: both; } -.icon-remove-circle:before { - content: "\f05c"; +.media-item { + position: relative; + float: left; + width: 189px; + padding: 15px; + margin: 15px 0 0 15px; + background-color: white; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.icon-ok-circle:before { - content: "\f05d"; +.media-item span.count { + color: #999; } -.icon-ban-circle:before { - content: "\f05e"; +.media-item .media-image { + margin-bottom: 5px; } -.icon-arrow-left:before { - content: "\f060"; +.media-item .media-edit { + opacity: 0; + position: absolute; + right: 15px; + bottom: 15px; + -webkit-transition: opacity 0.2s ease-in; + -moz-transition: opacity 0.2s ease-in; + -o-transition: opacity 0.2s ease-in; + transition: opacity 0.2s ease-in; } -.icon-arrow-right:before { - content: "\f061"; +.media-item:hover { + z-index: 1; } -.icon-arrow-up:before { - content: "\f062"; +.media-item:hover .media-edit { + opacity: 1; } -.icon-arrow-down:before { - content: "\f063"; +.media-view { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + border: 1px solid #dddddd; + overflow: hidden; + -webkit-transition: all 0.2s ease-in; + -moz-transition: all 0.2s ease-in; + -o-transition: all 0.2s ease-in; + transition: all 0.2s ease-in; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.icon-share-alt:before { - content: "\f064"; +.media-view:hover, +.media-view.hovered { + border-color: #c14531; + -webkit-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.1); + box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.1); } -.icon-resize-full:before { - content: "\f065"; +.media-view:hover .banner, +.media-view.hovered .banner { + background-color: #c14531; } -.icon-resize-small:before { - content: "\f066"; +.media-view span { + display: none; } -.icon-plus:before { - content: "\f067"; +.media-view .banner { + display: block; + background-color: #b7b7b7; + -webkit-transition: background-color 0.2s ease-in; + -moz-transition: background-color 0.2s ease-in; + -o-transition: background-color 0.2s ease-in; + transition: background-color 0.2s ease-in; } -.icon-minus:before { - content: "\f068"; +.media-image { + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } -.icon-asterisk:before { - content: "\f069"; +.media-heading { + font-size: 18px; + line-height: 1.3; + margin: 5px 0; } -.icon-exclamation-sign:before { - content: "\f06a"; +.media-overlay { + position: relative; + min-height: 35px; } -.icon-gift:before { - content: "\f06b"; +.media-overlay .media-heading { + position: absolute; + left: 0; + right: 0; + bottom: 0; + padding: 12px 10px; + margin: 0; + background-color: #000; + background-color: rgba(0, 0, 0, 0.8); + font-size: 13px; + color: #fff; + z-index: 1; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; } -.icon-leaf:before { - content: "\f06c"; +.media-overlay .media-image { + float: none; + display: block; + margin-right: 0; } -.icon-fire:before { - content: "\f06d"; +.media-item.is-expander .truncator-link { + -webkit-transition: opacity 0.2s ease-in; + -moz-transition: opacity 0.2s ease-in; + -o-transition: opacity 0.2s ease-in; + transition: opacity 0.2s ease-in; + position: absolute; + z-index: 10; + left: 15px; + bottom: 15px; + opacity: 0; } -.icon-eye-open:before { - content: "\f06e"; +.media-item.is-expander:hover { + padding-bottom: 35px; } -.icon-eye-close:before { - content: "\f070"; +.media-item.is-expander:hover .truncator-link { + opacity: 1; } -.icon-warning-sign:before { - content: "\f071"; +.wide .media-item { + width: 186px; } -.icon-plane:before { - content: "\f072"; +.nav-simple, +.nav-aside { + *zoom: 1; + margin: 0; + list-style: none; + padding-bottom: 0; } -.icon-calendar:before { - content: "\f073"; +.nav-simple:before, +.nav-aside:before, +.nav-simple:after, +.nav-aside:after { + display: table; + content: ""; + line-height: 0; } -.icon-random:before { - content: "\f074"; +.nav-simple:after, +.nav-aside:after { + clear: both; } -.icon-comment:before { - content: "\f075"; +.nav-simple > li, +.nav-aside > li { + font-size: 12px; + line-height: 1.1666666666666667em; + padding: 7px 25px; + border-bottom: 1px dotted #dddddd; } -.icon-magnet:before { - content: "\f076"; +.nav-simple > li:last-of-type, +.nav-aside > li:last-of-type { + border-bottom: 0; } -.icon-chevron-up:before { - content: "\f077"; +.nav-simple .ckan-icon, +.nav-aside .ckan-icon { + position: relative; + top: 0px; } -.icon-chevron-down:before { - content: "\f078"; +.nav-aside { + border-top: 1px dotted #DDD; + border-bottom: 1px dotted #DDD; + margin-bottom: 15px; } -.icon-retweet:before { - content: "\f079"; +.nav-item > a, +.nav-aside li a { + color: #333333; + font-size: 14px; + line-height: 20px; + margin: -7px -25px; + padding: 7px 25px; } -.icon-shopping-cart:before { - content: "\f07a"; +.nav-item.active, +.nav-aside li.active { + background-color: #f6f6f6; } -.icon-folder-close:before { - content: "\f07b"; +.nav-item.active > a, +.nav-aside li.active a { + position: relative; + color: #ffffff; + background-color: #8ca0a6; } -.icon-folder-open:before { - content: "\f07c"; +.nav-item.active > a:hover, +.nav-aside li.active a:hover { + color: #ffffff; + background-color: #8ca0a6; } -.icon-resize-vertical:before { - content: "\f07d"; +.nav-item.active > a:before, +.nav-aside li.active a:before { + content: ' '; + position: absolute; + top: 0; + right: -6px; + width: 6px; + height: 34px; + background-image: url("../../../base/images/nav-active.png?1"); } -.icon-resize-horizontal:before { - content: "\f07e"; +.nav-item.active > a span, +.nav-aside li.active a span { + white-space: nowrap; + overflow: hidden; + display: block; } -.icon-bar-chart:before { - content: "\f080"; +.module-narrow .nav-item > a, +.module-narrow .nav-aside li a { + padding-left: 15px; + padding-right: 15px; + position: relative; } -.icon-twitter-sign:before { - content: "\f081"; +.module-narrow .nav-item.image, +.module-narrow .nav-aside li.image { + position: relative; } -.icon-facebook-sign:before { - content: "\f082"; +.module-narrow .nav-item.image > a, +.module-narrow .nav-aside li.image a { + padding-left: 42px; + padding-right: 42px; } -.icon-camera-retro:before { - content: "\f083"; +.module-narrow .nav-item.image > img, +.module-narrow .nav-aside li.image img { + position: absolute; + top: 50%; + left: 15px; + width: 20px; + height: 20px; + margin-top: -10px; + z-index: 2; } -.icon-key:before { - content: "\f084"; +.nav-facet .nav-item > a:hover:after, +.nav-facet .nav-item.active > a:after { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + content: ""; + position: absolute; + top: 50%; + right: 5px; + margin-top: -8px; } -.icon-cogs:before { - content: "\f085"; +.nav-facet .nav-item > a:hover:after { + width: 17px; + height: 17px; + background-position: -17px -16px; } -.icon-comments:before { - content: "\f086"; +.nav-facet .nav-item.active > a:after { + width: 17px; + height: 17px; + background-position: 0px -16px; + right: 3px; } -.icon-thumbs-up:before { - content: "\f087"; +.user-list { + margin: 0; + list-style: none; } -.icon-thumbs-down:before { - content: "\f088"; +.user-list li { + margin: 0 0 10px 0; } -.icon-star-half:before { - content: "\f089"; +.user-list .gravatar { + vertical-align: -4px; + margin-right: 3px; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; } -.icon-heart-empty:before { - content: "\f08a"; +.nav-facet-tertiary { + margin: 10px 0; } -.icon-signout:before { - content: "\f08b"; +.nav-facet-tertiary .module-heading { + margin-bottom: 5px; + padding: 8px 12px; + border-bottom-width: 0; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; } -.icon-linkedin-sign:before { - content: "\f08c"; +.nav-facet-tertiary .module-heading i { + display: none; } -.icon-pushpin:before { - content: "\f08d"; +.nav-facet-tertiary .module-footer { + padding: 8px 12px; + border-top-width: 0; } -.icon-external-link:before { - content: "\f08e"; +.nav-facet-tertiary .module-footer a { + font-weight: normal; + color: #8C8C8C; } -.icon-signin:before { - content: "\f090"; +.nav-facet-tertiary .nav { + margin-bottom: 0; } -.icon-trophy:before { - content: "\f091"; +.nav-facet-tertiary .module-content.empty { + padding: 8px 12px; + margin-top: 0; } -.icon-github-sign:before { - content: "\f092"; +.nav-facet-tertiary .nav li.active { + position: relative; } -.icon-upload-alt:before { - content: "\f093"; +.nav-facet-tertiary .nav li.active > a:hover:after, +.nav-facet-tertiary .nav li.active > a:after { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + width: 17px; + height: 17px; + background-position: 0px -16px; + content: ""; + position: absolute; + top: 50%; + right: 5px; + margin-top: -8px; } -.icon-lemon:before { - content: "\f094"; +.nav-simple > .nav-btn { + padding-left: 0; + padding-right: 0; + text-align: center; } -.icon-phone:before { - content: "\f095"; +.nav-simple > .nav-btn .btn { + display: inline-block; } -.icon-check-empty:before { - content: "\f096"; +.js .js-hide { + display: none; } -.icon-bookmark-empty:before { - content: "\f097"; +.js .js-hide.active { + display: block; } -.icon-phone-sign:before { - content: "\f098"; +.btn, +label { + font-weight: bold; } -.icon-twitter:before { - content: "\f099"; +.btn-rounded { + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; + padding-left: 15px; + padding-right: 15px; } -.icon-facebook:before { - content: "\f09a"; +label { + cursor: pointer; + font-size: 14px; } -.icon-github:before { - content: "\f09b"; +label:after { + content: ":"; } -.icon-unlock:before { - content: "\f09c"; +label.radio:after, +label.checkbox:after { + content: ""; } -.icon-credit-card:before { - content: "\f09d"; +input[type=radio], +input[type=checkbox] { + position: relative; + top: 7px; + padding: 0; + margin: 0; } -.icon-rss:before { - content: "\f09e"; +input[type=radio].checkbox-onown, +input[type=checkbox].checkbox-onown { + top: 0; } -.icon-hdd:before { - content: "\f0a0"; +select { + padding: 4px; } -.icon-bullhorn:before { - content: "\f0a1"; +textarea { + max-width: 100%; } -.icon-bell:before { - content: "\f0a2"; +.control-group .btn { + position: relative; + top: -2px; } -.icon-certificate:before { - content: "\f0a3"; +.control-full input, +.control-full select, +.control-full textarea { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + height: auto; + width: 100%; } -.icon-hand-right:before { - content: "\f0a4"; +.control-medium input, +.control-medium select, +.control-medium textarea { + width: 320px; } -.icon-hand-left:before { - content: "\f0a5"; +.control-large input, +.control-large .control-label { + font-size: 17.5px; + line-height: 30px; } -.icon-hand-up:before { - content: "\f0a6"; +.control-large input { + height: 41px; } -.icon-hand-down:before { - content: "\f0a7"; +.form-actions { + background: none; + margin-left: -25px; + margin-right: -25px; + margin-bottom: 0; + padding-bottom: 0; + text-align: right; } -.icon-circle-arrow-left:before { - content: "\f0a8"; +.form-actions .action-info { + float: left; + width: 50%; + line-height: 2; + text-align: left; + color: #707070; + margin: 0; } -.icon-circle-arrow-right:before { - content: "\f0a9"; +.form-actions .action-info.small { + font-size: 11px; + line-height: 1.2; } -.icon-circle-arrow-up:before { - content: "\f0aa"; +.form-horizontal .control-label { + width: 120px; } -.icon-circle-arrow-down:before { - content: "\f0ab"; +.form-horizontal .controls { + margin-left: 130px; } -.icon-globe:before { - content: "\f0ac"; +.form-horizontal .info-block { + position: relative; + display: block; + font-size: 11px; + color: #aaaaaa; + line-height: 1.3; + padding: 6px 0 6px 25px; + margin-top: 6px; } -.icon-wrench:before { - content: "\f0ad"; +.form-horizontal .info-help { + padding: 6px 0; } -.icon-tasks:before { - content: "\f0ae"; +.form-horizontal .info-help:before { + display: none; } -.icon-filter:before { - content: "\f0b0"; +.form-horizontal .info-help-tight { + margin-top: -10px; } -.icon-briefcase:before { - content: "\f0b1"; +.form-horizontal .info-inline { + float: right; + width: 265px; + margin-top: 0; + padding-bottom: 0; } -.icon-fullscreen:before { - content: "\f0b2"; +.form-horizontal .control-medium .info-block.info-inline { + width: 165px; } -.icon-group:before { - content: "\f0c0"; +.form-horizontal .info-block:before { + font-size: 2.2em; + position: absolute; + left: 0; + top: 2px; } -.icon-link:before { - content: "\f0c1"; +.form-horizontal .info-inline:before { + top: 8px; } -.icon-cloud:before { - content: "\f0c2"; +.info-block .icon-large, +.info-inline .icon-large { + float: left; + font-size: 22px; + margin-right: 15px; } -.icon-beaker:before { - content: "\f0c3"; +.form-horizontal .info-block a { + color: #aaaaaa; + text-decoration: underline; } -.icon-cut:before { - content: "\f0c4"; +.form-horizontal .form-actions { + padding-left: 25px; + padding-right: 25px; } -.icon-copy:before { - content: "\f0c5"; +.form-inline input { + padding-bottom: 9px; } -.icon-paper-clip:before { - content: "\f0c6"; -} -.icon-save:before { - content: "\f0c7"; +.form-inline select { + margin-top: 0; } -.icon-sign-blank:before { - content: "\f0c8"; +.form-inline .btn { + margin-left: 5px; } -.icon-reorder:before { - content: "\f0c9"; +.form-narrow label { + margin-bottom: 0; } -.icon-list-ul:before { - content: "\f0ca"; +.form-narrow select { + width: 100%; } -.icon-list-ol:before { - content: "\f0cb"; +.form-narrow .form-actions { + margin-left: -15px; + margin-right: -15px; + padding: 10px 15px 0; } -.icon-strikethrough:before { - content: "\f0cc"; +.form-select label { + margin-right: 5px; } -.icon-underline:before { - content: "\f0cd"; +.simple-input label, +.simple-input button { + display: none; } -.icon-table:before { - content: "\f0ce"; +.simple-input .field { + position: relative; } -.icon-magic:before { - content: "\f0d0"; +.simple-input .field-bordered { + border-bottom: 1px dotted #dddddd; } -.icon-truck:before { - content: "\f0d1"; +.simple-input .field input { + width: 100%; + height: auto; + margin: 0 -7px; + padding: 7px 5px; } -.icon-pinterest:before { - content: "\f0d2"; +.simple-input .field .btn-search { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + background-position: -51px -16px; + position: absolute; + display: block; + height: 17px; + width: 17px; + top: 50%; + right: 0; + margin-top: -8px; + background-color: transparent; + border: none; + text-indent: -999em; } -.icon-pinterest-sign:before { - content: "\f0d3"; +.editor textarea { + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; + border-bottom: none; } -.icon-google-plus-sign:before { - content: "\f0d4"; +.editor .editor-info-block { + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; + display: block; + float: none; + padding: 4px 10px; + background: #ebebeb; + width: auto; + border: 1px solid #cccccc; + border-top: none; + font-size: 11px; + color: #282828; } -.icon-google-plus:before { - content: "\f0d5"; +.editor .editor-info-block a { + color: #c14531; + text-decoration: none; } -.icon-money:before { - content: "\f0d6"; +.control-custom { + font-size: 0; } -.icon-caret-down:before { - content: "\f0d7"; +.control-custom label { + margin-bottom: 0; } -.icon-caret-up:before { - content: "\f0d8"; +.control-custom input { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + width: 140px; } -.icon-caret-left:before { - content: "\f0d9"; +.control-custom input:last-of-type { + -webkit-border-radius: 0 3px 3px 0; + -moz-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; } -.icon-caret-right:before { - content: "\f0da"; +.control-custom .checkbox { + display: inline-block; + margin-left: 5px; } -.icon-columns:before { - content: "\f0db"; +.control-custom .checkbox input { + width: auto; } -.icon-sort:before { - content: "\f0dc"; +.control-custom.disabled label, +.control-custom.disabled input { + color: #aaaaaa; + text-decoration: line-through; + text-shadow: none; } -.icon-sort-down:before { - content: "\f0dd"; +.control-custom.disabled input { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + background-color: #f3f3f3; } -.icon-sort-up:before { - content: "\f0de"; +.control-custom.disabled .checkbox { + color: #444444; + text-decoration: none; } -.icon-envelope-alt:before { - content: "\f0e0"; +.control-custom .checkbox.btn { + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; + position: relative; + top: 0; + left: 5px; + height: 1px; + width: 9px; + padding: 3px 8px; + line-height: 18px; } -.icon-linkedin:before { - content: "\f0e1"; +.control-custom .checkbox.btn span { + display: none; + width: 30px; } -.icon-undo:before { - content: "\f0e2"; +.control-custom .checkbox.btn:before { + position: relative; + top: 1px; + left: -1px; + color: #fff; } -.icon-legal:before { - content: "\f0e3"; +.control-custom .checkbox.btn input { + display: none; } -.icon-dashboard:before { - content: "\f0e4"; +.control-custom.disabled .checkbox.btn { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #cc5845; + background-image: -moz-linear-gradient(top, #d36452, #c14531); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d36452), to(#c14531)); + background-image: -webkit-linear-gradient(top, #d36452, #c14531); + background-image: -o-linear-gradient(top, #d36452, #c14531); + background-image: linear-gradient(to bottom, #d36452, #c14531); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd36452', endColorstr='#ffc14531', GradientType=0); + border-color: #c14531 #c14531 #842f22; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + *background-color: #c14531; + /* Darken IE7 buttons by default so they stand out more given they won't have borders */ + + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } -.icon-comment-alt:before { - content: "\f0e5"; +.control-custom.disabled .checkbox.btn:hover, +.control-custom.disabled .checkbox.btn:focus, +.control-custom.disabled .checkbox.btn:active, +.control-custom.disabled .checkbox.btn.active, +.control-custom.disabled .checkbox.btn.disabled, +.control-custom.disabled .checkbox.btn[disabled] { + color: #ffffff; + background-color: #c14531; + *background-color: #ad3e2c; } -.icon-comments-alt:before { - content: "\f0e6"; +.control-custom.disabled .checkbox.btn:active, +.control-custom.disabled .checkbox.btn.active { + background-color: #983627 \9; } -.icon-bolt:before { - content: "\f0e7"; +.control-custom.disabled .checkbox.btn .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; } -.icon-sitemap:before { - content: "\f0e8"; +.alert-danger a, +.alert-error a { + color: #b55457; } -.icon-umbrella:before { - content: "\f0e9"; +.control-group.error input, +.control-group.error select, +.control-group.error textarea, +.control-group.error .input-prepend .add-on, +.control-group.error .input-append .add-on { + border-color: #c6898b; } -.icon-paste:before { - content: "\f0ea"; +.error-inline { + color: #b55457; } -.icon-user-md:before { - content: "\f200"; +.error-block, +.error-inline { + font-size: 12px; } -.pill { - background-color: #cccccc; +.error-block { + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; + display: block; + padding: 6px 8px 3px; + background: #c6898b; + margin: -3px 0 0; color: #ffffff; - padding: 1px 5px 1px 8px; - margin-right: 5px; - -webkit-border-radius: 7px; - -moz-border-radius: 7px; - border-radius: 7px; + width: 208px; } -.pill a { - color: #ffffff; +.control-medium .error-block { + width: 318px; } -.pill a.remove { - font-size: 11px; +.control-full .error-block { + width: auto; } -.tag { - background: url("../../../base/images/background-tag.png") no-repeat -13px center; - position: relative; - display: block; - font-size: 11px; - line-height: 27px; - color: #b50909; - padding-left: 10px; - padding-right: 5px; - margin-right: 11px; +.control-group.error .input-prepend .error-block, +.control-custom.error .error-block { + width: auto; } -.tag:before { - content: ""; - background: url("../../../base/images/background-tag.png") no-repeat center left; - position: absolute; - display: block; - top: 0; - bottom: 0; - right: -11px; - width: 11px; +.control-custom.error .error-block { + width: 401px; } -.unstyled { - margin: 0; - list-style: none; -} -.simple-item { - font-size: 12px; - line-height: 1.1666666666666667em; - padding: 7px 25px; - border-bottom: 1px dotted #cccccc; -} -.simple-item:last-of-type { - border-bottom: 0; +.control-select.error .error-block { + width: 196px; } -.simple-list { - *zoom: 1; +.stages { margin: 0; list-style: none; + *zoom: 1; + color: #aeaeae; + counter-reset: stage; + margin: -20px -25px 20px; + overflow: hidden; } -.simple-list:before, -.simple-list:after { +.stages:before, +.stages:after { display: table; content: ""; + line-height: 0; } -.simple-list:after { +.stages:after { clear: both; } -.simple-list > li { - font-size: 12px; - line-height: 1.1666666666666667em; - padding: 7px 25px; - border-bottom: 1px dotted #cccccc; +.stages li { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + line-height: 27px; + counter-increment: stage; + width: 33.33%; + background-color: #ededed; + float: left; + padding: 10px 20px; + position: relative; + z-index: 0; } -.simple-list > li:last-of-type { - border-bottom: 0; +.stages li:before { + -webkit-border-radius: 14px; + -moz-border-radius: 14px; + border-radius: 14px; + content: counter(stage); + display: inline-block; + width: 27px; + height: 27px; + margin-right: 5px; + font-weight: bold; + text-align: center; + color: #ffffff; + background-color: #aeaeae; + z-index: 1; } -.simple-list .ckan-icon { - position: relative; - top: 0px; +.stages li:after { + left: 0; + border: solid rgba(237, 237, 237, 0); + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; + border-top-color: #ededed; + border-bottom-color: #ededed; + border-width: 29px; + top: 50%; + margin-top: -29px; + margin-left: -30px; } -.module-narrow .simple-list > li { - padding-left: 15px; - padding-right: 15px; +.stages li.last { position: relative; + right: -1px; } -.listing li { - text-align: right; - margin-bottom: 5px; -} -.listing .key { - clear: right; - font-weight: bold; +.stages li.last, +.stages li.last .highlight { + -webkit-border-radius: 0 3px 0 0; + -moz-border-radius: 0 3px 0 0; + border-radius: 0 3px 0 0; } -.js .tab-content { - display: none; +.stages li.first:after { + content: none; + border: none; } -.js .tab-content.active { - display: block; +.stages li.active:after { + border-color: rgba(140, 198, 138, 0); + border-top-color: #8cc68a; + border-bottom-color: #8cc68a; } -.module { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); - background-color: #ffffff; - margin-bottom: 20px; +.stages li.complete:after { + border-color: rgba(197, 226, 196, 0); + border-top-color: #c5e2c4; + border-bottom-color: #c5e2c4; } -.module-heading { - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - font-size: 14px; - line-height: 1.3; - padding: 7px 25px; - border-bottom: 1px solid #d0d0d0; - background-color: #f3f3f3; - background-image: -moz-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -ms-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f0f0f0)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -o-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: linear-gradient(top, #f5f5f5, #f0f0f0); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f0f0f0', GradientType=0); +.stages.stage-3 li.complete:first-child:after { + content: none; } -.module-heading-secondary { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - border-top: 1px solid #d0d0d0; +.stages li.active, +.stages li.complete { + background: none; } -.module-heading [class^=icon]:before { - font-size: 1.2em; - line-height: 1; - position: relative; - top: 1px; - margin-right: 0.1em; +.stages li.active:before { + color: #8cc68a; + background: #ffffff; } -.module-heading .action { - float: right; - color: #8c8c8c; - font-size: 11px; - text-decoration: underline; +.stages li.complete:before { + color: #c5e2c4; + background: #eef6ed; } -.module-content { - padding: 0 25px; - margin: 20px 0; +.stages li .highlight { + display: block; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + width: 100%; + padding: 10px 52px; + border: none; + text-align: left; + text-decoration: none; + line-height: 27px; + z-index: -1; } -.module-content:first-child { - margin-top: 0; - padding-top: 20px; +.stages li.active .highlight { + color: #ffffff; + background: #8cc68a; } -.module-content:last-child { - margin-bottom: 0; - padding-bottom: 20px; +.stages li.complete .highlight { + color: #eef6ed; + background: #c5e2c4; } -.module-content > :last-child { +.alert > :last-child { margin-bottom: 0; } -.module-border-top { - border-top: 1px dotted #cccccc; +.slug-preview { + font-size: 14px; + line-height: 1.5; + margin-top: 5px; + margin-left: 10px; } -.module-border-bottom { - border-bottom: 1px dotted #cccccc; +.slug-preview-value { + background-color: #faedcf; + margin-right: 3px; } -.module-footer { - padding: 7px 25px 7px; - border-top: 1px dotted #cccccc; +.resource-upload-field { + position: relative; + overflow: hidden; + display: inline-block; + vertical-align: bottom; } -.module .read-more { - font-weight: bold; - color: #000000; +.resource-upload-field label { + z-index: 0; } -.module .pagination { - height: 34px; - margin-bottom: 0; - border-top: 1px solid #d0d0d0; +.resource-upload-field input { + opacity: 0; + filter: alpha(opacity=0); + position: absolute; + top: 0; + right: 0; + z-index: 1; + margin: 0; + border: solid transparent; + border-width: 100px 0 0 200px; + cursor: pointer; + direction: ltr; + -moz-transform: translate(-300px, 0) scale(4); } -.module .pagination > ul { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - border: 0; +.resource-upload-field.loading { + display: inline-block; + background: url("../../../base/images/loading-spinner.gif") no-repeat center right; + padding-right: 5px; } -.module .pagination li a { - border-top: none; - border-bottom: none; +.select2-container .select2-choice input, +.select2-container-multi .select2-choices .select2-search-field:first-child input { + font-size: 14px; } -.module .pagination li:first-child a, -.module .pagination li:last-child a { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; +.select2-container-multi .select2-choices .select2-search-field input { + height: 29px; } -.module .pagination li:first-child a { - border-left-width: 0; +.select2-container .select2-choice input, +.select2-container-multi .select2-choices .select2-search-field:first-child input { + padding-left: 10px; } -.module .pagination li:last-child a { - border-right-width: 0; +.select2-container { + margin-top: 1px; } -.module .pagination li.active a { - border-left-width: 1px; - border-right-width: 1px; +.select2-container-multi { + margin-top: 0; } -.module .action { - text-align: center; +.select2-container-multi .select2-choices .select2-search-choice { + padding: 5px 8px 5px 22px; } -.module-shallow .module-content { - padding: 10px; - margin: 0; +.select2-container-multi.select2-container .select2-choices { + padding-top: 3px; + padding-bottom: 3px; } -.module-shallow .module-content:first-child { - padding-top: 10px; -} -.module-shallow .module-content:last-child { - padding-bottom: 10px; +.select2-search-choice-close, +.select2-container-multi .select2-search-choice-close { + top: 6px; + left: 5px; } -.module-shallow small { - font-size: 11px; - display: block; +.select2-container-multi .select2-choices { + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; + -moz-transition: border linear 0.2s, box-shadow linear 0.2s; + -o-transition: border linear 0.2s, box-shadow linear 0.2s; + transition: border linear 0.2s, box-shadow linear 0.2s; + background-color: #ffffff; + border: 1px solid #cccccc; } -.module-narrow .module-heading, -.module-narrow .module-content, -.module-narrow .module-footer { - padding-left: 15px; - padding-right: 15px; +.select2-container-active .select2-choices, +.select2-container-multi.select2-container-active .select2-choices { + border-color: rgba(82, 168, 236, 0.8); + outline: 0; + outline: thin dotted \9; + /* IE6-9 */ + + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); } -.module-grid { - margin: 0; - list-style: none; - margin: 0; - list-style: none; - *zoom: 1; - margin-left: -20px; - padding: 0; +.select2-container-multi .select2-drop { + margin-top: -2px; } -.module-grid:before, -.module-grid:after { - display: table; - content: ""; +.select2-container .select2-results li { + line-height: 18px; + padding-top: 4px; + padding-bottom: 4px; } -.module-grid:after { - clear: both; +.control-full .select2-container { + width: 520px !important; } -.module-item { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - width: 33.33%; - padding-left: 20px; - padding-bottom: 25px; - float: left; - float: left; - margin-left: 20px; - width: 460px; - padding-top: 10px; - padding-bottom: 10px; - padding-right: 50px; - overflow: hidden; - position: relative; +.control-group.error .select2-container input:focus, +.control-group.error .select2-container select:focus, +.control-group.error .select2-container textarea:focus { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } -.module-item.first { - clear: left; +.dataset-item { + border-bottom: 1px dotted #dddddd; + padding-bottom: 20px; + margin-bottom: 20px; } -.group .content img { - margin: 0 -5px 5px; - max-width: initial; +.dataset-item:last-of-type { + border-bottom: none; + margin-bottom: 0; + padding-bottom: 0; } -.group .content h3 { - font-size: 14px; +.dataset-heading { + font-size: 16px; + margin-top: 0; + margin-bottom: 8px; line-height: 1.3; } -.group-listing { - margin-left: -20px; +.dataset-heading a { + color: #333333; } -.ckanext-datapreview { +.dataset-heading .label { position: relative; + top: -1px; } -.ckanext-datapreview > iframe { - min-height: 400px; -} -.ckanext-datapreview > img { - max-height: 500px; - max-width: 100%; - overflow: hidden; +.dataset-private { + margin-right: 10px; + text-transform: uppercase; } -.package-info h4 { - margin-bottom: 10px; +.dataset-private .icon-lock { + width: 9px; } -.media { - position: relative; - overflow: hidden; +.dataset-private.pull-right { + margin-right: 0; } -.media-content > :last-child { - margin-bottom: 0; +.dataset-resources { + margin-top: 8px; } -.media-heading { - font-size: 14px; - line-height: 1.3em; - margin: 5px 0; +.dataset-resources li { + display: inline; } -.media-image, -.media .gravatar { - position: relative; - float: left; - margin-right: 10px; - overflow: hidden; +.dataset-resources li a { + background-color: #aaaaaa; } -.media-image:after { - -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3); - -moz-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3); - box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.3); - content: ""; - position: absolute; +.dataset-heading .popular { top: 0; - left: 0; - right: 0; - bottom: 0; - z-index: 1; } -.media-image img { - display: block; - margin: 0 auto; -} -.media-vertical .media-image, -.media-vertical .media-content { - float: none; - display: block; -} -.media-vertical .media-image { - margin-right: 0; - max-height: 125px; -} -.media-grid, -ul.media-grid, -ol.media-grid { +.resource-list { margin: 0; list-style: none; - *zoom: 1; - margin-left: -20px; + margin: -10px -10px 10px -10px; } -.media-grid:before, -ul.media-grid:before, -ol.media-grid:before, -.media-grid:after, -ul.media-grid:after, -ol.media-grid:after { - display: table; - content: ""; +.resource-item { + position: relative; + padding: 10px 10px 10px 60px; + margin-bottom: 0px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } -.media-grid:after, -ul.media-grid:after, -ol.media-grid:after { - clear: both; +.resource-item:hover { + background-color: #eeeeee; } -.media-item { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - width: 33.33%; - padding-left: 20px; - padding-bottom: 25px; - float: left; +.resource-item .heading { + color: #000000; + font-size: 14px; + font-weight: bold; } -.media-item.first { - clear: left; +.resource-item .format-label { + position: absolute; + top: 10px; + left: 10px; } -.media-item .media-content { - min-height: 63px; +.resource-item .description { + font-size: 12px; + margin-bottom: 0; } -.related-item.expanded { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - background-color: #ffffff; - background-color: rgba(255, 255, 255, 0.9); - z-index: 2; +.resource-item .btn-group { + position: absolute; + top: 14px; + right: 10px; } -.media-wide { - padding: 0; +.dataset-resource-form .dataset-form-resource-types { + margin-bottom: 5px; } -.media-wide .media { - float: left; - margin-left: 20px; - width: 460px; +.dataset-form-resource-types .ckan-icon { + position: relative; + top: 3px; } -.media-overlay { +.dataset-form-resource-types .radio { + font-weight: normal; + padding-left: 0; + padding-right: 18px; +} +.dataset-form-resource-types label { position: relative; - min-height: 35px; } -.media-overlay .media-heading { +.dataset-form-resource-types input[type=radio]:checked + label { + font-weight: bold; +} +.dataset-form-resource-types input[type=radio]:checked + label:after { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + width: 16px; + height: 16px; + background-position: -192px 0; + display: block; + content: ""; position: absolute; + top: auto; left: 0; - right: 0; - bottom: 0; - padding: 12px 10px; + bottom: -12px; +} +.dataset-form-resource-types input[type=radio] { + display: none; +} +.tag-list { margin: 0; - background-color: #000; - background-color: rgba(0, 0, 0, 0.8); - font-size: 13px; - color: #fff; - z-index: 1; + list-style: none; + padding: 10px 10px 5px 10px; } -.media-overlay .media-image { - float: none; - display: block; +.tag-list li { + display: inline-block; + margin-right: 5px; +} +.tag-list li:last-child { margin-right: 0; } -.banner { - -webkit-transform: rotate(45deg); - -moz-transform: rotate(45deg); - -ms-transform: rotate(45deg); - -o-transform: rotate(45deg); - transform: rotate(45deg); - -webkit-transform-origin: center center; - -moz-transform-origin: center center; - -ms-transform-origin: center center; - -o-transform-origin: center center; - transform-origin: center center; - position: absolute; - top: 15px; - right: -35px; - width: 80px; - color: #ffffff; - background: #707070; - padding: 1px 20px; - font-size: 11px; - text-align: center; - text-transform: uppercase; +.additional-info td, +.additional-info th { + width: 50%; } -.nav-simple { - *zoom: 1; - margin: 0; - list-style: none; - padding-bottom: 0; +.label[data-format=html], +.label[data-format*=html] { + background-color: #55a1ce; } -.nav-simple:before, -.nav-simple:after { - display: table; - content: ""; +.label[data-format=json], +.label[data-format*=json] { + background-color: #ef7100; } -.nav-simple:after { - clear: both; +.label[data-format=xml], +.label[data-format*=xml] { + background-color: #ef7100; } -.nav-simple > li { - font-size: 12px; - line-height: 1.1666666666666667em; - padding: 7px 25px; - border-bottom: 1px dotted #cccccc; +.label[data-format=text], +.label[data-format*=text] { + background-color: #74cbec; } -.nav-simple > li:last-of-type { - border-bottom: 0; +.label[data-format=csv], +.label[data-format*=csv] { + background-color: #dfb100; } -.nav-simple .ckan-icon { - position: relative; - top: 0px; +.label[data-format=xls], +.label[data-format*=xls] { + background-color: #2db55d; } -.nav-item > a { - color: #333333; - margin: -7px -25px; - padding: 7px 25px; +.label[data-format=zip], +.label[data-format*=zip] { + background-color: #686868; } -.nav-item.active { - background-color: #f2f2f2; +.label[data-format=api], +.label[data-format*=api] { + background-color: #ec96be; } -.nav-item.active > a span { - white-space: nowrap; - overflow: hidden; - display: block; +.label[data-format=pdf], +.label[data-format*=pdf] { + background-color: #e0051e; +} +.label[data-format=rdf], +.label[data-format*=rdf], +.label[data-format*=nquad], +.label[data-format*=ntriples], +.label[data-format*=turtle] { + background-color: #0b4498; } -.nav-item.active > a { - background: url("../../../base/images/background-tag.png") no-repeat -13px center; +.search-form { + margin-bottom: 20px; + padding-bottom: 25px; + border-bottom: 1px dotted #dddddd; +} +.search-form .search-input { position: relative; - display: block; - font-size: 11px; - line-height: 27px; - color: #b50909; - padding-left: 10px; - padding-right: 5px; - margin-right: 11px; + margin-bottom: 20px; +} +.search-form .search-input input { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; - -ms-box-sizing: border-box; box-sizing: border-box; - font-size: 12px; - font-weight: bold; - position: relative; - left: 4px; - margin-left: -25px; - margin-right: -20px; - padding-left: 10px; - padding-right: 0px; - padding: 1px 22px; + margin: 0; + width: 100%; + height: auto; } -.nav-item.active > a:before { - content: ""; - background: url("../../../base/images/background-tag.png") no-repeat center left; - position: absolute; +.search-form .search-input button { + cursor: pointer; display: block; - top: 0; - bottom: 0; - right: -11px; - width: 11px; + position: absolute; + top: 50%; + margin-top: -10px; + right: 10px; + height: 20px; + padding: 0; + border: none; + background: transparent; } -.nav-item [class^=icon] { - font-size: 1.2em; - margin: -1px 0 -1px -1px; +.search-form .search-input button span { + display: none; } -.module-narrow .nav-item > a { - padding-left: 15px; - padding-right: 15px; - position: relative; +.search-form .search-input button i { + color: #cccccc; + -webkit-transition: color 0.2s ease-in; + -moz-transition: color 0.2s ease-in; + -o-transition: color 0.2s ease-in; + transition: color 0.2s ease-in; } -.module-narrow .nav-item.active > a { - padding-left: 12px; - padding-right: 12px; +.search-form .search-input button:hover i { + color: #000000; } -.module-narrow .nav-item.image { - position: relative; +.search-form .search-input.search-giant input { + font-size: 16px; + padding: 15px; } -.module-narrow .nav-item.image > a { - padding-left: 42px; - padding-right: 42px; +.search-form .search-input.search-giant button { + margin-top: -15px; + right: 15px; + height: 30px; } -.module-narrow .nav-item.image > img { - position: absolute; - top: 50%; - left: 15px; - width: 20px; - height: 20px; - margin-top: -10px; - z-index: 2; +.search-form .search-input.search-giant button i { + font-size: 28px; + width: 28px; } -.nav-facet .nav-item > a:hover:after, -.nav-facet .nav-item.active > a:after { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - content: ""; - position: absolute; - top: 50%; - right: 5px; - margin-top: -8px; +.search-form .control-order-by { + float: right; + margin: 0 0 0 15px; } -.nav-facet .nav-item > a:hover:after:last-child, -.nav-facet .nav-item.active > a:after:last-child { - *margin-left: 0; +.search-form .control-order-by label, +.search-form .control-order-by select { + display: inline; } -.nav-facet .nav-item > a:hover:after { - width: 17px; - height: 17px; - background-position: -17px -16px; +.search-form .control-order-by select { + width: 160px; + margin: 0; } -.nav-facet .nav-item.active > a:after { - width: 17px; - height: 17px; - background-position: 0px -16px; - right: 3px; +.search-form h2 { + font-size: 24px; + line-height: 1.3; + color: #000000; + margin-bottom: 0; } -.js .js-hide { - display: none; +.search-form .filter-list { + color: #444444; + line-height: 32px; + margin: 10px 0 0 0; } -.js .js-hide.active { +.search-form .filter-list .pill { + line-height: 21px; +} +.search-form .filter-list .extra { + margin-top: 10px; + font-size: 18px; + font-weight: normal; + color: #000000; +} +.tertiary .control-order-by { + float: none; + margin: 0; +} +.tertiary .control-order-by label { display: block; + margin-bottom: 5px; + font-weight: normal; + font-size: 12px; } -.btn, -label { - font-weight: bold; +.tertiary .control-order-by select { + display: block; + font-size: 12px; + width: 100%; } -label { - cursor: pointer; - font-size: 14px; - line-height: 2; +.tertiary .search-input { + margin-bottom: 10px; } -label:after { - content: ":"; +.group .media-vertical .image { + margin: 0 -5px 5px; } -label.radio:after, -label.checkbox:after { - content: ""; +.group-list:nth-child(odd) { + clear: left; } -input, -textarea, -select, -.uneditable-input { - font-size: 14px; - padding: 8px 10px; +.group-list .module-heading { + padding-top: 15px; + padding-bottom: 15px; } -input[type=radio], -input[type=checkbox] { - position: relative; - top: 7px; - padding: 0; - margin: 0; +.group-list .dataset-content { + min-height: 54px; } -input[type=radio].checkbox-onown, -input[type=checkbox].checkbox-onown { - top: 0; +.group-list .module-heading h3 { + margin-bottom: 2px; } -select { - margin-top: 6px; - padding: 4px; +.group-list .module-heading h3 a { + color: #333333; } -textarea { - max-width: 100%; +.group-list .module-heading .media-image { + overflow: hidden; + max-height: 60px; } -.input-prepend .add-on { - padding: 8px 8px; - font-size: 14px; +.group-list .module-heading .media-image img { + max-width: 85px; } -.control-group .btn { +.toolbar { + *zoom: 1; position: relative; - top: -2px; + margin-bottom: 10px; + padding: 5px 0; } -.control-full input, -.control-full select, -.control-full textarea { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - height: auto; - width: 100%; +.toolbar:before, +.toolbar:after { + display: table; + content: ""; + line-height: 0; } -.control-medium input, -.control-medium select, -.control-medium textarea { - width: 320px; +.toolbar:after { + clear: both; } -.control-large input, -.control-large .control-label { - font-size: 18px; +.page_primary_action { + margin-bottom: 20px; } -.form-actions { - background: none; - margin-left: -25px; - margin-right: -25px; - margin-bottom: 0; - padding-bottom: 0; - text-align: right; -} -.form-actions .action-info { +.toolbar .breadcrumb { + *zoom: 1; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + position: relative; float: left; - width: 50%; - line-height: 2; - text-align: left; - color: #707070; margin: 0; + padding: 0; + border: none; + background: none; + font-size: 20px; + line-height: 1.3; } -.form-actions .action-info.small { - font-size: 11px; - line-height: 1.2; +.toolbar .breadcrumb:before, +.toolbar .breadcrumb:after { + display: table; + content: ""; + line-height: 0; } -.form-horizontal .control-label { - width: 120px; - line-height: 1.3; - padding-top: 9px; +.toolbar .breadcrumb:after { + clear: both; } -.form-horizontal .control-large input, -.form-horizontal .control-large .control-label { - font-size: 18px; - line-height: 2; +.toolbar .breadcrumb li:after { + content: " / "; } -.form-horizontal .control-large .control-label { - padding-top: 10px; +.toolbar .breadcrumb li.active:after { + content: ""; } -.form-horizontal .controls { - margin-left: 130px; +.toolbar .breadcrumb li:last-of-type:after { + content: ""; } -.form-horizontal .info-block { - position: relative; - display: block; - font-size: 11px; - color: #aeaeae; - line-height: 1.3; - padding: 6px 0 6px 25px; - margin-top: 6px; +.toolbar .home a { + text-decoration: none; } -.form-horizontal .info-inline { - float: right; - width: 265px; - margin-top: 0; +.toolbar .home span { + display: none; } -.form-horizontal .control-medium .info-block.info-inline { - width: 165px; +.toolbar .breadcrumb a { + color: #505050; } -.form-horizontal .info-block:before { - font-size: 2.2em; +.toolbar .breadcrumb .active a, +.toolbar .breadcrumb a.active { + font-weight: bold; +} +.actions { + margin: 0; + list-style: none; position: absolute; - left: 0; - top: 2px; + top: 10px; + right: 10px; + z-index: 1; } -.form-horizontal .info-inline:before { - top: 8px; +.actions li { + display: inline-block; + margin-right: 5px; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; } -.info-block .icon-large, -.info-inline .icon-large { +.actions li:last-of-type { + margin-right: 0; +} +.hide-heading { + display: none; +} +.page-header { + *zoom: 1; + border-bottom: 1px solid #dddddd; + background-color: #f6f6f6; + -webkit-border-radius: 0 3px 0 0; + -moz-border-radius: 0 3px 0 0; + border-radius: 0 3px 0 0; +} +.page-header:before, +.page-header:after { + display: table; + content: ""; + line-height: 0; +} +.page-header:after { + clear: both; +} +.page-header .nav-tabs { float: left; - font-size: 22px; - margin-right: 15px; + margin-bottom: -1px; } -.form-horizontal .info-block a { - color: #aeaeae; - text-decoration: underline; +.page-header .nav-tabs li.active a, +.page-header .nav-tabs a:hover { + background-color: #ffffff; } -.form-horizontal .form-actions { - padding-left: 25px; - padding-right: 25px; +.page-header .content_action { + float: right; + margin-top: -5px; + margin-right: -7px; } -.form-inline input { - padding-bottom: 9px; +.no-nav .page-header { + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } -.form-inline select { - margin-top: 0; +h1 { + font-size: 28px; } -.form-inline .btn { - margin-left: 5px; +h2 { + font-size: 21px; } -.form-narrow label { - margin-bottom: 0; +h3 { + font-size: 18px; } -.form-narrow select { - width: 100%; +h4 { + font-size: 14px; } -.form-narrow .form-actions { - margin-left: -15px; - margin-right: -15px; - padding: 10px 15px 0; +h1, +h2, +h3, +h4 { + line-height: 1.5; } -.form-select label { - margin-right: 5px; +h1 small, +h2 small, +h3 small, +h4 small { + font-size: 14px; } -.simple-input label, -.simple-input button { - display: none; +.prose h1, +.prose heading-1 h2, +.prose heading-2 { + margin-bottom: 15px; } -.simple-input .field { - position: relative; +.prose h3, +.prose heading-3 { + margin-bottom: 10px; } -.simple-input .field-bordered { - border-bottom: 1px dotted #cccccc; +.table-chunky td, +.table-chunky th { + padding: 12px 15px; + font-size: 12px; } -.simple-input .field input { - width: 100%; - height: auto; - margin: 0 -7px; - padding: 7px 5px; +.table-chunky thead th, +.table-chunky thead td { + color: #ffffff; + background-color: #aaaaaa; + padding-top: 10px; + padding-bottom: 10px; } -.simple-input .field .btn-search { +.table-striped tbody tr:nth-child(odd) td, +.table-striped tbody tr:nth-child(odd) th { + background-color: transparent; +} +.table-striped tbody tr:nth-child(even) td, +.table-striped tbody tr:nth-child(even) th { + background-color: #f2f2f2; +} +.table-chunky.table-bordered { + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; +} +.table-chunky.table-bordered thead:first-child tr:first-child th:first-child, +.table-chunky.table-bordered tbody:first-child tr:first-child td:first-child { + -webkit-border-top-left-radius: 2px; + -moz-border-radius-topleft: 2px; + border-top-left-radius: 2px; +} +.table-chunky.table-bordered thead:first-child tr:first-child th:last-child, +.table-chunky.table-bordered tbody:first-child tr:first-child td:last-child { + -webkit-border-top-right-radius: 2px; + -moz-border-radius-topright: 2px; + border-top-right-radius: 2px; +} +.table-chunky.table-bordered thead:last-child tr:last-child th:first-child, +.table-chunky.table-bordered tbody:last-child tr:last-child td:first-child { + -webkit-border-radius: 0 0 0 2px; + -moz-border-radius: 0 0 0 2px; + border-radius: 0 0 0 2px; + -webkit-border-bottom-left-radius: 2px; + -moz-border-radius-bottomleft: 2px; + border-bottom-left-radius: 2px; +} +.table-chunky.table-bordered thead:last-child tr:last-child th:last-child, +.table-chunky.table-bordered tbody:last-child tr:last-child td:last-child { + -webkit-border-bottom-right-radius: 2px; + -moz-border-radius-bottomright: 2px; + border-bottom-right-radius: 2px; +} +.ellipsis { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.ckan-icon { *margin-right: .3em; display: inline-block; vertical-align: text-bottom; @@ -5209,1524 +6647,1336 @@ textarea { background-image: url("../../../base/images/sprite-ckan-icons.png"); background-repeat: no-repeat; background-position: 16px 16px; - width: 17px; - height: 17px; - background-position: -51px -16px; - position: absolute; - display: block; - height: 17px; - width: 17px; - top: 50%; - right: 0; - margin-top: -8px; - background-color: transparent; - border: none; - text-indent: -999em; } -.simple-input .field .btn-search:last-child { - *margin-left: 0; +.ckan-icon-fb { + width: 16px; + height: 16px; + background-position: 0px 0; } -.editor textarea { - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - border-bottom: none; +.ckan-icon-gplus { + width: 16px; + height: 16px; + background-position: -16px 0; } -.editor .editor-info-block { - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - display: block; - float: none; - padding: 4px 10px; - background: #ebebeb; +.ckan-icon-twitter { + width: 16px; + height: 16px; + background-position: -32px 0; +} +.ckan-icon-email { + width: 16px; + height: 16px; + background-position: -48px 0; +} +.ckan-icon-share { + width: 16px; + height: 16px; + background-position: -64px 0; +} +.ckan-icon-feed { + width: 16px; + height: 16px; + background-position: -80px 0; +} +.ckan-icon-calendar { + width: 16px; + height: 16px; + background-position: -96px 0; +} +.ckan-icon-file { + width: 16px; + height: 16px; + background-position: -112px 0; +} +.ckan-icon-lock { + width: 16px; + height: 16px; + background-position: -128px 0; +} +.ckan-icon-link-file { + width: 16px; + height: 16px; + background-position: -144px 0; +} +.ckan-icon-link-plugin { + width: 16px; + height: 16px; + background-position: -160px 0; +} +.ckan-icon-upload-file { + width: 16px; + height: 16px; + background-position: -176px 0; +} +.ckan-icon-callout { + width: 16px; + height: 16px; + background-position: -192px 0; +} +.ckan-icon-circle-cross { + width: 17px; + height: 17px; + background-position: 0px -16px; +} +.ckan-icon-circle-add { + width: 17px; + height: 17px; + background-position: -17px -16px; +} +.ckan-icon-flame { + width: 17px; + height: 17px; + background-position: -34px -16px; +} +.ckan-icon-search { + width: 17px; + height: 17px; + background-position: -51px -16px; +} +.ckan-icon-large-lock { + width: 20px; + height: 20px; + background-position: 0px -33px; +} +.ckan-icon-photo { + width: 20px; + height: 20px; + background-position: -20px -33px; +} +.ckan-icon-add { + width: 20px; + height: 20px; + background-position: -40px -33px; +} +.ckan-icon-home { + width: 20px; + height: 20px; + background-position: -60px -33px; +} +.ckan-icon-rewind { + width: 20px; + height: 20px; + background-position: -80px -33px; +} +.ckan-icon-tools { + width: 20px; + height: 20px; + background-position: -100px -33px; +} +.ckan-icon-flag { + width: 20px; + height: 20px; + background-position: -120px -33px; +} +.ckan-icon-clipboard { + width: 20px; + height: 20px; + background-position: -140px -33px; +} +.ckan-icon-share { + width: 20px; + height: 20px; + background-position: -160px -33px; +} +.ckan-icon-info { + width: 20px; + height: 20px; + background-position: -180px -33px; +} +.ckan-icon-download { + width: 20px; + height: 20px; + background-position: -200px -33px; +} +.ckan-icon-star { + width: 20px; + height: 20px; + background-position: -220px -33px; +} +.ckan-icon-info-flat { + width: 20px; + height: 20px; + background-position: -240px -33px; +} +.ckan-icon-tag { + width: 20px; + height: 20px; + background-position: -260px -33px; +} +.ckan-icon-plus { + width: 20px; + height: 20px; + background-position: -280px -33px; + width: 16px; +} +.ckan-icon-head { + width: 20px; + height: 20px; + background-position: -300px -33px; +} +.ckan-icon-arrow-e { + width: 20px; + height: 20px; + background-position: -320px -33px; + width: 16px; +} +.ckan-icon-bookmark { + width: 25px; + height: 25px; + background-position: 0px -53px; +} +.format-label { + *margin-right: .3em; + display: inline-block; + vertical-align: text-bottom; + position: relative; + top: 2px; + width: 16px; + height: 16px; + background-image: url("../../../base/images/sprite-ckan-icons.png"); + background-repeat: no-repeat; + background-position: 16px 16px; + text-indent: -900em; + background: url("../../../base/images/sprite-resource-icons.png") no-repeat 0 0; +} +.format-label { + width: 32px; + height: 35px; + background-position: 0px -62px; +} +.format-label[data-format=rdf], +.format-label[data-format*=rdf] { + width: 32px; + height: 35px; + background-position: -32px -62px; +} +.format-label[data-format=pdf], +.format-label[data-format*=pdf] { + width: 32px; + height: 35px; + background-position: -64px -62px; +} +.format-label[data-format=api], +.format-label[data-format*=api] { + width: 32px; + height: 35px; + background-position: -96px -62px; +} +.format-label[data-format=zip], +.format-label[data-format*=zip] { + width: 32px; + height: 35px; + background-position: -128px -62px; +} +.format-label[data-format=xls], +.format-label[data-format*=xls] { + width: 32px; + height: 35px; + background-position: -160px -62px; +} +.format-label[data-format=csv], +.format-label[data-format*=csv] { + width: 32px; + height: 35px; + background-position: -192px -62px; +} +.format-label[data-format=txt], +.format-label[data-format*=txt] { + width: 32px; + height: 35px; + background-position: -224px -62px; +} +.format-label[data-format=xml], +.format-label[data-format*=xml] { + width: 32px; + height: 35px; + background-position: -256px -62px; +} +.format-label[data-format=json], +.format-label[data-format*=json] { + width: 32px; + height: 35px; + background-position: -288px -62px; +} +.format-label[data-format=html], +.format-label[data-format*=html] { + width: 32px; + height: 35px; + background-position: -320px -62px; +} +/* This is a modified version of the font-awesome core less document. */ +@font-face { + font-family: 'FontAwesome'; + src: url('../../../base/vendor/font-awesome/font/fontawesome-webfont.eot?v=3.0.1'); + src: url('../../../base/vendor/font-awesome/font/fontawesome-webfont.eot?#iefix&v=3.0.1') format('embedded-opentype'), url('../../../base/vendor/font-awesome/font/fontawesome-webfont.woff?v=3.0.1') format('woff'), url('../../../base/vendor/font-awesome/font/fontawesome-webfont.ttf?v=3.0.1') format('truetype'); + font-weight: normal; + font-style: normal; +} +[class^="icon-"], +[class*=" icon-"] { + font-family: FontAwesome; + font-weight: normal; + font-style: normal; + text-decoration: inherit; + -webkit-font-smoothing: antialiased; + display: inline; width: auto; - border: 1px solid #cccccc; - border-top: none; - font-size: 11px; - color: #282828; + height: auto; + line-height: normal; + vertical-align: baseline; + background-image: none; + background-position: 0% 0%; + background-repeat: repeat; + margin-top: 0; } -.editor .editor-info-block a { - color: #b50909; - text-decoration: none; +.icon-spin { + display: inline-block; + -moz-animation: spin 2s infinite linear; + -o-animation: spin 2s infinite linear; + -webkit-animation: spin 2s infinite linear; + animation: spin 2s infinite linear; +} +@-moz-keyframes spin { + 0% { + -moz-transform: rotate(0deg); + } + 100% { + -moz-transform: rotate(359deg); + } } -.control-custom { - font-size: 0; +@-webkit-keyframes spin { + 0% { + -webkit-transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + } } -.control-custom label { - margin-bottom: 0; +@-o-keyframes spin { + 0% { + -o-transform: rotate(0deg); + } + 100% { + -o-transform: rotate(359deg); + } } -.control-custom input { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - width: 140px; +@-ms-keyframes spin { + 0% { + -ms-transform: rotate(0deg); + } + 100% { + -ms-transform: rotate(359deg); + } } -.control-custom input:last-of-type { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; +@keyframes spin { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(359deg); + } } -.control-custom .checkbox { - display: inline-block; - margin-left: 5px; +@-moz-document url-prefix() { + .icon-spin { + height: .9em; + } + .btn .icon-spin { + height: auto; + } + .icon-spin.icon-large { + height: 1.25em; + } + .btn .icon-spin.icon-large { + height: .75em; + } } -.control-custom .checkbox input { - width: auto; +/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen + readers do not read off random characters that represent icons */ +.icon-glass:before { + content: "\f000"; } -.control-custom.disabled label, -.control-custom.disabled input { - color: #aaaaaa; - text-decoration: line-through; - text-shadow: none; +.icon-music:before { + content: "\f001"; } -.control-custom.disabled input { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - background-color: #f3f3f3; +.icon-search:before { + content: "\f002"; } -.control-custom.disabled .checkbox { - color: #4d4d4d; - text-decoration: none; +.icon-envelope:before { + content: "\f003"; } -.control-custom .checkbox.btn { - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; - position: relative; - top: 0; - left: 5px; - height: 3px; - width: 8px; - padding: 3px 8px; +.icon-heart:before { + content: "\f004"; } -.control-custom .checkbox.btn span { - display: none; - width: 30px; +.icon-star:before { + content: "\f005"; } -.control-custom .checkbox.btn:before { - position: relative; - top: 1px; - left: -1px; - color: #fff; +.icon-star-empty:before { + content: "\f006"; } -.control-custom .checkbox.btn input { - display: none; +.icon-user:before { + content: "\f007"; } -.control-custom.disabled .checkbox.btn { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #f65454; - background-image: -moz-linear-gradient(top, #f54444, #f76b6b); - background-image: -ms-linear-gradient(top, #f54444, #f76b6b); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f54444), to(#f76b6b)); - background-image: -webkit-linear-gradient(top, #f54444, #f76b6b); - background-image: -o-linear-gradient(top, #f54444, #f76b6b); - background-image: linear-gradient(top, #f54444, #f76b6b); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f54444', endColorstr='#f76b6b', GradientType=0); - border-color: #f76b6b #f76b6b #f32222; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #f76b6b; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-film:before { + content: "\f008"; } -.control-custom.disabled .checkbox.btn:hover, -.control-custom.disabled .checkbox.btn:active, -.control-custom.disabled .checkbox.btn.active, -.control-custom.disabled .checkbox.btn.disabled, -.control-custom.disabled .checkbox.btn[disabled] { - background-color: #f76b6b; - *background-color: #f65353; +.icon-th-large:before { + content: "\f009"; } -.control-custom.disabled .checkbox.btn:active, -.control-custom.disabled .checkbox.btn.active { - background-color: #f43b3b \9; +.icon-th:before { + content: "\f00a"; } -.control-custom.disabled .checkbox.btn .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-th-list:before { + content: "\f00b"; } -.alert-danger a, -.alert-error a { - color: #b55457; +.icon-ok:before { + content: "\f00c"; } -.control-group.error input, -.control-group.error select, -.control-group.error textarea, -.control-group.error .input-prepend .add-on, -.control-group.error .input-append .add-on { - border-color: #c6898b; +.icon-remove:before { + content: "\f00d"; } -.error-inline { - color: #b55457; +.icon-zoom-in:before { + content: "\f00e"; } -.error-block, -.error-inline { - font-size: 12px; +.icon-zoom-out:before { + content: "\f010"; } -.error-block { - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - display: block; - padding: 6px 8px 3px; - background: #c6898b; - margin: -3px 0 0; - color: #ffffff; - width: 216px; +.icon-off:before { + content: "\f011"; } -.control-medium .error-block { - width: 326px; +.icon-signal:before { + content: "\f012"; } -.control-full .error-block { - width: auto; +.icon-cog:before { + content: "\f013"; } -.control-group.error .input-prepend .error-block, -.control-custom.error .error-block { - margin-left: -1px; - width: auto; +.icon-trash:before { + content: "\f014"; } -.control-custom.error .error-block { - width: 409px; +.icon-home:before { + content: "\f015"; } -.control-select.error .error-block { - width: 204px; +.icon-file:before { + content: "\f016"; } -.stages { - margin: 0; - list-style: none; - *zoom: 1; - color: #aeaeae; - counter-reset: stage; - margin: -20px -25px 20px; - overflow: hidden; +.icon-time:before { + content: "\f017"; } -.stages:before, -.stages:after { - display: table; - content: ""; +.icon-road:before { + content: "\f018"; } -.stages:after { - clear: both; +.icon-download-alt:before { + content: "\f019"; } -.stages li { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - line-height: 27px; - counter-increment: stage; - width: 33.33%; - background-color: #ededed; - float: left; - padding: 10px 20px; - position: relative; - z-index: 0; +.icon-download:before { + content: "\f01a"; } -.stages li:before { - -webkit-border-radius: 14px; - -moz-border-radius: 14px; - border-radius: 14px; - content: counter(stage); - display: inline-block; - width: 27px; - height: 27px; - margin-right: 5px; - font-weight: bold; - text-align: center; - color: #ffffff; - background-color: #aeaeae; - z-index: 1; +.icon-upload:before { + content: "\f01b"; +} +.icon-inbox:before { + content: "\f01c"; +} +.icon-play-circle:before { + content: "\f01d"; +} +.icon-repeat:before { + content: "\f01e"; +} +/* \f020 doesn't work in Safari. all shifted one down */ +.icon-refresh:before { + content: "\f021"; +} +.icon-list-alt:before { + content: "\f022"; +} +.icon-lock:before { + content: "\f023"; +} +.icon-flag:before { + content: "\f024"; +} +.icon-headphones:before { + content: "\f025"; +} +.icon-volume-off:before { + content: "\f026"; +} +.icon-volume-down:before { + content: "\f027"; +} +.icon-volume-up:before { + content: "\f028"; +} +.icon-qrcode:before { + content: "\f029"; +} +.icon-barcode:before { + content: "\f02a"; } -.stages li:after { - left: 0; - border: solid rgba(237, 237, 237, 0); - content: " "; - height: 0; - width: 0; - position: absolute; - pointer-events: none; - border-top-color: #ededed; - border-bottom-color: #ededed; - border-width: 29px; - top: 50%; - margin-top: -29px; - margin-left: -30px; +.icon-tag:before { + content: "\f02b"; } -.stages li.first, -.stages li.first .highlight { - -webkit-border-radius: 3px 0 0 0; - -moz-border-radius: 3px 0 0 0; - border-radius: 3px 0 0 0; +.icon-tags:before { + content: "\f02c"; } -.stages li.last { - position: relative; - right: -1px; +.icon-book:before { + content: "\f02d"; } -.stages li.last, -.stages li.last .highlight { - -webkit-border-radius: 0 3px 0 0; - -moz-border-radius: 0 3px 0 0; - border-radius: 0 3px 0 0; +.icon-bookmark:before { + content: "\f02e"; } -.stages li.first:after { - content: none; - border: none; +.icon-print:before { + content: "\f02f"; } -.stages li.active:after { - border-color: rgba(140, 198, 138, 0); - border-top-color: #8cc68a; - border-bottom-color: #8cc68a; +.icon-camera:before { + content: "\f030"; } -.stages li.complete:after { - border-color: rgba(197, 226, 196, 0); - border-top-color: #c5e2c4; - border-bottom-color: #c5e2c4; +.icon-font:before { + content: "\f031"; } -.stages.stage-3 li.complete:first-child:after { - content: none; +.icon-bold:before { + content: "\f032"; } -.stages li.active, -.stages li.complete { - background: none; +.icon-italic:before { + content: "\f033"; } -.stages li.active:before { - color: #8cc68a; - background: #ffffff; +.icon-text-height:before { + content: "\f034"; } -.stages li.complete:before { - color: #c5e2c4; - background: #eef6ed; +.icon-text-width:before { + content: "\f035"; } -.stages li .highlight { - display: block; - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - width: 100%; - padding: 10px 52px; - border: none; - text-align: left; - text-decoration: none; - line-height: 27px; - z-index: -1; +.icon-align-left:before { + content: "\f036"; } -.stages li.active .highlight { - color: #ffffff; - background: #8cc68a; +.icon-align-center:before { + content: "\f037"; } -.stages li.complete .highlight { - color: #eef6ed; - background: #c5e2c4; +.icon-align-right:before { + content: "\f038"; } -.alert > :last-child { - margin-bottom: 0; +.icon-align-justify:before { + content: "\f039"; } -.slug-preview { - font-size: 14px; - line-height: 1.5; - margin-top: 5px; - margin-left: 10px; +.icon-list:before { + content: "\f03a"; } -.slug-preview-value { - background-color: #faedcf; - margin-right: 3px; +.icon-indent-left:before { + content: "\f03b"; } -.slug-preview .btn { - padding-top: 3px; - padding-bottom: 3px; +.icon-indent-right:before { + content: "\f03c"; } -.resource-upload-field { - position: relative; - overflow: hidden; - display: inline-block; - vertical-align: bottom; +.icon-facetime-video:before { + content: "\f03d"; } -.resource-upload-field label { - z-index: 0; +.icon-picture:before { + content: "\f03e"; } -.resource-upload-field input { - opacity: 0; - filter: alpha(opacity=0); - position: absolute; - top: 0; - right: 0; - z-index: 1; - margin: 0; - border: solid transparent; - border-width: 100px 0 0 200px; - cursor: pointer; - direction: ltr; - -moz-transform: translate(-300px, 0) scale(4); +.icon-pencil:before { + content: "\f040"; } -.resource-upload-field.loading { - display: inline-block; - background: url("../../../base/images/loading-spinner.gif") no-repeat center right; - padding-right: 5px; +.icon-map-marker:before { + content: "\f041"; } -.select2-container .select2-choice input, -.select2-container-multi .select2-choices .select2-search-field:first-child input { - font-size: 14px; +.icon-adjust:before { + content: "\f042"; } -.select2-container-multi .select2-choices .select2-search-field input { - height: 29px; +.icon-tint:before { + content: "\f043"; } -.select2-container .select2-choice input, -.select2-container-multi .select2-choices .select2-search-field:first-child input { - padding-left: 10px; +.icon-edit:before { + content: "\f044"; } -.select2-container { - margin-top: 5px; +.icon-share:before { + content: "\f045"; } -.select2-container-multi { - margin-top: 0; +.icon-check:before { + content: "\f046"; } -.select2-container-multi .select2-choices .select2-search-choice { - padding: 5px 8px 5px 22px; +.icon-move:before { + content: "\f047"; } -.select2-container-multi.select2-container .select2-choices { - padding-top: 3px; - padding-bottom: 3px; +.icon-step-backward:before { + content: "\f048"; } -.select2-search-choice-close, -.select2-container-multi .select2-search-choice-close { - top: 6px; - left: 5px; +.icon-fast-backward:before { + content: "\f049"; } -.select2-container-multi .select2-choices { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; - background-color: #ffffff; - border: 1px solid #cccccc; +.icon-backward:before { + content: "\f04a"; } -.select2-container-active .select2-choices, -.select2-container-multi.select2-container-active .select2-choices { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); +.icon-play:before { + content: "\f04b"; } -.select2-container-multi .select2-drop { - margin-top: -2px; +.icon-pause:before { + content: "\f04c"; } -.select2-container .select2-results li { - line-height: 18px; - padding-top: 4px; - padding-bottom: 4px; +.icon-stop:before { + content: "\f04d"; } -.control-full .select2-container { - width: 520px !important; +.icon-forward:before { + content: "\f04e"; } -.dataset-item { - border-bottom: 1px dotted #cccccc; - padding-bottom: 20px; - margin-bottom: 20px; +.icon-fast-forward:before { + content: "\f050"; } -.dataset-item:last-of-type { - border-bottom: none; - margin-bottom: 0; - padding-bottom: 0; +.icon-step-forward:before { + content: "\f051"; } -.dataset-heading { - font-size: 14px; - line-height: 1.3; +.icon-eject:before { + content: "\f052"; } -.dataset-heading a { - color: #333333; +.icon-chevron-left:before { + content: "\f053"; +} +.icon-chevron-right:before { + content: "\f054"; +} +.icon-plus-sign:before { + content: "\f055"; +} +.icon-minus-sign:before { + content: "\f056"; +} +.icon-remove-sign:before { + content: "\f057"; } -.dataset-heading .label { - position: relative; - top: -1px; +.icon-ok-sign:before { + content: "\f058"; } -.dataset-content { - font-size: 12px; +.icon-question-sign:before { + content: "\f059"; } -.dataset-resources { - font-size: 10px; - line-height: 14px; - margin-top: 5px; +.icon-info-sign:before { + content: "\f05a"; } -.dataset-resources li { - display: inline; +.icon-screenshot:before { + content: "\f05b"; } -.dataset-resources li a { - background-color: #aaaaaa; +.icon-remove-circle:before { + content: "\f05c"; } -.dataset-heading .popular { - top: 0; +.icon-ok-circle:before { + content: "\f05d"; } -.results { - margin-bottom: 20px; - padding-bottom: 25px; - border-bottom: 1px dotted #cccccc; +.icon-ban-circle:before { + content: "\f05e"; } -.results strong { - display: block; - font-size: 24px; - line-height: 1.3; - color: #000000; - margin-bottom: 10px; +.icon-arrow-left:before { + content: "\f060"; } -.results strong:before { - float: right; - content: " "; - width: 280px; - white-space: pre; +.icon-arrow-right:before { + content: "\f061"; } -.filter-list { - color: #4d4d4d; - font-weight: bold; +.icon-arrow-up:before { + content: "\f062"; } -.filter-list .extra { - margin-top: 10px; - font-size: 18px; - font-weight: normal; - color: #000000; +.icon-arrow-down:before { + content: "\f063"; } -.dataset-search { - position: relative; +.icon-share-alt:before { + content: "\f064"; } -.search-giant { - position: relative; +.icon-resize-full:before { + content: "\f065"; } -.search-giant input { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - font-size: 16px; - padding: 14px 10px; - width: 100%; - height: auto; +.icon-resize-small:before { + content: "\f066"; } -.search-giant button { - cursor: pointer; - position: absolute; - right: 15px; - top: 50%; - display: block; - border: none; - padding: 0; - margin-top: -17px; - width: 30px; - height: 30px; - background: transparent url("../../../base/images/icon-search-27x26.png") no-repeat center center; - text-indent: -900em; +.icon-plus:before { + content: "\f067"; } -.control-order-by { - position: absolute; - bottom: -65px; - right: 0; +.icon-minus:before { + content: "\f068"; } -.control-order-by label, -.control-order-by select { - display: inline; +.icon-asterisk:before { + content: "\f069"; } -.control-order-by select { - width: 160px; +.icon-exclamation-sign:before { + content: "\f06a"; } -.resource-list { - margin: 0; - list-style: none; - margin: -10px -10px 10px -10px; +.icon-gift:before { + content: "\f06b"; } -.resource-item { - position: relative; - padding: 10px 110px 10px 60px; - margin-bottom: 0px; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; +.icon-leaf:before { + content: "\f06c"; } -.resource-item:hover { - background-color: #efefef; +.icon-fire:before { + content: "\f06d"; } -.resource-item .heading { - color: #000000; - font-size: 14px; - font-weight: bold; +.icon-eye-open:before { + content: "\f06e"; } -.resource-item .format-label { - position: absolute; - top: 10px; - left: 10px; +.icon-eye-close:before { + content: "\f070"; } -.resource-item .description { - font-size: 12px; - margin-bottom: 0; +.icon-warning-sign:before { + content: "\f071"; } -.resource-item .btn-group { - position: absolute; - top: 13px; - right: 10px; +.icon-plane:before { + content: "\f072"; } -.dataset-resource-form .dataset-form-resource-types { - margin-bottom: 5px; +.icon-calendar:before { + content: "\f073"; } -.dataset-form-resource-types .ckan-icon { - position: relative; - top: 3px; +.icon-random:before { + content: "\f074"; } -.dataset-form-resource-types .radio { - font-weight: normal; - padding-left: 0; - padding-right: 18px; +.icon-comment:before { + content: "\f075"; } -.dataset-form-resource-types label { - position: relative; +.icon-magnet:before { + content: "\f076"; } -.dataset-form-resource-types input[type=radio]:checked + label { - font-weight: bold; +.icon-chevron-up:before { + content: "\f077"; } -.dataset-form-resource-types input[type=radio]:checked + label:after { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - width: 16px; - height: 16px; - background-position: -192px 0; - display: block; - content: ""; - position: absolute; - top: auto; - left: 0; - bottom: -12px; +.icon-chevron-down:before { + content: "\f078"; } -.dataset-form-resource-types input[type=radio]:checked + label:after:last-child { - *margin-left: 0; +.icon-retweet:before { + content: "\f079"; } -.dataset-form-resource-types input[type=radio] { - display: none; +.icon-shopping-cart:before { + content: "\f07a"; } -.tag-list { - margin: 0; - list-style: none; - padding: 10px; +.icon-folder-close:before { + content: "\f07b"; } -.tag-list li { - display: inline-block; - margin-right: 5px; +.icon-folder-open:before { + content: "\f07c"; } -.tag-list li:last-child { - margin-right: 0; +.icon-resize-vertical:before { + content: "\f07d"; } -.additional-info td, -.additional-info th { - width: 50%; +.icon-resize-horizontal:before { + content: "\f07e"; } -.label[data-format=html], -.label[data-format*=html] { - background-color: #55a1ce; +.icon-bar-chart:before { + content: "\f080"; } -.label[data-format=json], -.label[data-format*=json] { - background-color: #ef7100; +.icon-twitter-sign:before { + content: "\f081"; } -.label[data-format=xml], -.label[data-format*=xml] { - background-color: #ef7100; +.icon-facebook-sign:before { + content: "\f082"; } -.label[data-format=text], -.label[data-format*=text] { - background-color: #74cbec; +.icon-camera-retro:before { + content: "\f083"; } -.label[data-format=csv], -.label[data-format*=csv] { - background-color: #dfb100; +.icon-key:before { + content: "\f084"; } -.label[data-format=xls], -.label[data-format*=xls] { - background-color: #2db55d; +.icon-cogs:before { + content: "\f085"; } -.label[data-format=zip], -.label[data-format*=zip] { - background-color: #686868; +.icon-comments:before { + content: "\f086"; } -.label[data-format=api], -.label[data-format*=api] { - background-color: #ec96be; +.icon-thumbs-up:before { + content: "\f087"; } -.label[data-format=pdf], -.label[data-format*=pdf] { - background-color: #e0051e; +.icon-thumbs-down:before { + content: "\f088"; } -.label[data-format=rdf], -.label[data-format*=rdf], -.label[data-format*=nquad], -.label[data-format*=ntriples], -.label[data-format*=turtle] { - background-color: #0b4498; +.icon-star-half:before { + content: "\f089"; } -.group .media-vertical .image { - margin: 0 -5px 5px; +.icon-heart-empty:before { + content: "\f08a"; } -.group-list:nth-child(odd) { - clear: left; +.icon-signout:before { + content: "\f08b"; } -.group-list .module-heading { - padding-top: 15px; - padding-bottom: 15px; +.icon-linkedin-sign:before { + content: "\f08c"; } -.group-list .dataset-content { - min-height: 54px; +.icon-pushpin:before { + content: "\f08d"; } -.group-list .module-heading h3 { - margin-bottom: 2px; +.icon-external-link:before { + content: "\f08e"; } -.group-list .module-heading h3 a { - color: #333333; +.icon-signin:before { + content: "\f090"; } -.toolbar { - *zoom: 1; - margin-top: -10px; - margin-bottom: 10px; - padding: 5px 0; +.icon-trophy:before { + content: "\f091"; } -.toolbar:before, -.toolbar:after { - display: table; - content: ""; +.icon-github-sign:before { + content: "\f092"; } -.toolbar:after { - clear: both; +.icon-upload-alt:before { + content: "\f093"; } -.toolbar .breadcrumb { - *zoom: 1; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - position: relative; - float: left; - margin: 0; - padding: 0; - border: none; - background: none; - font-size: 20px; +.icon-lemon:before { + content: "\f094"; } -.toolbar .breadcrumb:before, -.toolbar .breadcrumb:after { - display: table; - content: ""; +.icon-phone:before { + content: "\f095"; } -.toolbar .breadcrumb:after { - clear: both; +.icon-check-empty:before { + content: "\f096"; } -.toolbar li [class^=icon]:before { - width: auto; +.icon-bookmark-empty:before { + content: "\f097"; } -.toolbar .breadcrumb li:after { - content: " / "; +.icon-phone-sign:before { + content: "\f098"; } -.toolbar .breadcrumb li.active:after { - content: ""; +.icon-twitter:before { + content: "\f099"; } -.toolbar .breadcrumb li:last-of-type:after { - content: ""; +.icon-facebook:before { + content: "\f09a"; } -.toolbar .home a { - text-decoration: none; +.icon-github:before { + content: "\f09b"; } -.toolbar .home span { - display: none; +.icon-unlock:before { + content: "\f09c"; } -.toolbar .breadcrumb a { - color: #505050; - line-height: 28px; +.icon-credit-card:before { + content: "\f09d"; } -.toolbar .breadcrumb .active a { - font-weight: bold; +.icon-rss:before { + content: "\f09e"; } -.toolbar .actions { - margin: 0; - list-style: none; +.icon-hdd:before { + content: "\f0a0"; } -.toolbar .actions li { - display: inline-block; - margin-right: 5px; +.icon-bullhorn:before { + content: "\f0a1"; } -.toolbar .actions li { - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; +.icon-bell:before { + content: "\f0a2"; } -.toolbar .actions li:last-of-type { - margin-right: 0; +.icon-certificate:before { + content: "\f0a3"; } -.toolbar .btn { - padding: 0 10px 0 8px; - border-color: #b7b7b7; - line-height: 27px; +.icon-hand-right:before { + content: "\f0a4"; } -.toolbar .btn-success { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(top, #62c462, #51a351); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); - border-color: #51a351 #51a351 #387038; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #51a351; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-hand-left:before { + content: "\f0a5"; } -.toolbar .btn-success:hover, -.toolbar .btn-success:active, -.toolbar .btn-success.active, -.toolbar .btn-success.disabled, -.toolbar .btn-success[disabled] { - background-color: #51a351; - *background-color: #499249; +.icon-hand-up:before { + content: "\f0a6"; } -.toolbar .btn-success:active, -.toolbar .btn-success.active { - background-color: #408140 \9; +.icon-hand-down:before { + content: "\f0a7"; } -.toolbar .btn-success .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-circle-arrow-left:before { + content: "\f0a8"; } -.toolbar .btn-primary { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #f65454; - background-image: -moz-linear-gradient(top, #f54444, #f76b6b); - background-image: -ms-linear-gradient(top, #f54444, #f76b6b); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f54444), to(#f76b6b)); - background-image: -webkit-linear-gradient(top, #f54444, #f76b6b); - background-image: -o-linear-gradient(top, #f54444, #f76b6b); - background-image: linear-gradient(top, #f54444, #f76b6b); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f54444', endColorstr='#f76b6b', GradientType=0); - border-color: #f76b6b #f76b6b #f32222; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #f76b6b; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-circle-arrow-right:before { + content: "\f0a9"; } -.toolbar .btn-primary:hover, -.toolbar .btn-primary:active, -.toolbar .btn-primary.active, -.toolbar .btn-primary.disabled, -.toolbar .btn-primary[disabled] { - background-color: #f76b6b; - *background-color: #f65353; +.icon-circle-arrow-up:before { + content: "\f0aa"; } -.toolbar .btn-primary:active, -.toolbar .btn-primary.active { - background-color: #f43b3b \9; +.icon-circle-arrow-down:before { + content: "\f0ab"; } -.toolbar .btn-primary .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-globe:before { + content: "\f0ac"; } -.toolbar .btn-warning { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #faa732; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(top, #fbb450, #f89406); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); - border-color: #f89406 #f89406 #ad6704; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #f89406; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-wrench:before { + content: "\f0ad"; } -.toolbar .btn-warning:hover, -.toolbar .btn-warning:active, -.toolbar .btn-warning.active, -.toolbar .btn-warning.disabled, -.toolbar .btn-warning[disabled] { - background-color: #f89406; - *background-color: #df8505; +.icon-tasks:before { + content: "\f0ae"; } -.toolbar .btn-warning:active, -.toolbar .btn-warning.active { - background-color: #c67605 \9; +.icon-filter:before { + content: "\f0b0"; } -.toolbar .btn-warning .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-briefcase:before { + content: "\f0b1"; } -.toolbar .btn-danger { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #da4f49; - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(top, #ee5f5b, #bd362f); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); - border-color: #bd362f #bd362f #802420; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #bd362f; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-fullscreen:before { + content: "\f0b2"; } -.toolbar .btn-danger:hover, -.toolbar .btn-danger:active, -.toolbar .btn-danger.active, -.toolbar .btn-danger.disabled, -.toolbar .btn-danger[disabled] { - background-color: #bd362f; - *background-color: #a9302a; +.icon-group:before { + content: "\f0c0"; } -.toolbar .btn-danger:active, -.toolbar .btn-danger.active { - background-color: #942a25 \9; +.icon-link:before { + content: "\f0c1"; } -.toolbar .btn-danger .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-cloud:before { + content: "\f0c2"; } -.toolbar .btn-success { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(top, #62c462, #51a351); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); - border-color: #51a351 #51a351 #387038; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #51a351; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-beaker:before { + content: "\f0c3"; } -.toolbar .btn-success:hover, -.toolbar .btn-success:active, -.toolbar .btn-success.active, -.toolbar .btn-success.disabled, -.toolbar .btn-success[disabled] { - background-color: #51a351; - *background-color: #499249; +.icon-cut:before { + content: "\f0c4"; } -.toolbar .btn-success:active, -.toolbar .btn-success.active { - background-color: #408140 \9; +.icon-copy:before { + content: "\f0c5"; } -.toolbar .btn-success .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-paper-clip:before { + content: "\f0c6"; } -.toolbar .btn-info { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #49afcd; - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); - background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(top, #5bc0de, #2f96b4); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); - border-color: #2f96b4 #2f96b4 #1f6377; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #2f96b4; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-save:before { + content: "\f0c7"; +} +.icon-sign-blank:before { + content: "\f0c8"; } -.toolbar .btn-info:hover, -.toolbar .btn-info:active, -.toolbar .btn-info.active, -.toolbar .btn-info.disabled, -.toolbar .btn-info[disabled] { - background-color: #2f96b4; - *background-color: #2a85a0; +.icon-reorder:before { + content: "\f0c9"; } -.toolbar .btn-info:active, -.toolbar .btn-info.active { - background-color: #24748c \9; +.icon-list-ul:before { + content: "\f0ca"; } -.toolbar .btn-info .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-list-ol:before { + content: "\f0cb"; } -.toolbar .btn-inverse { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #414141; - background-image: -moz-linear-gradient(top, #555555, #222222); - background-image: -ms-linear-gradient(top, #555555, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); - background-image: -webkit-linear-gradient(top, #555555, #222222); - background-image: -o-linear-gradient(top, #555555, #222222); - background-image: linear-gradient(top, #555555, #222222); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); - border-color: #222222 #222222 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #222222; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +.icon-strikethrough:before { + content: "\f0cc"; } -.toolbar .btn-inverse:hover, -.toolbar .btn-inverse:active, -.toolbar .btn-inverse.active, -.toolbar .btn-inverse.disabled, -.toolbar .btn-inverse[disabled] { - background-color: #222222; - *background-color: #151515; +.icon-underline:before { + content: "\f0cd"; } -.toolbar .btn-inverse:active, -.toolbar .btn-inverse.active { - background-color: #080808 \9; +.icon-table:before { + content: "\f0ce"; } -.toolbar .btn-inverse .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); +.icon-magic:before { + content: "\f0d0"; } -.hide-heading { - display: none; +.icon-truck:before { + content: "\f0d1"; } -.page-header { - position: relative; - border-bottom: 1px solid #d0d0d0; - height: 30px; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - background-color: #f3f3f3; - background-image: -moz-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -ms-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f0f0f0)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: -o-linear-gradient(top, #f5f5f5, #f0f0f0); - background-image: linear-gradient(top, #f5f5f5, #f0f0f0); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f0f0f0', GradientType=0); +.icon-pinterest:before { + content: "\f0d2"; } -.page-header .nav-tabs { - position: absolute; - left: 20px; - bottom: -1px; - margin-bottom: 0; +.icon-pinterest-sign:before { + content: "\f0d3"; } -.page-header .nav-tabs i { - margin-right: 10px; - font-size: 14px; +.icon-google-plus-sign:before { + content: "\f0d4"; } -.page-header .nav-tabs a:hover { - background-color: #ffffff; +.icon-google-plus:before { + content: "\f0d5"; } -.prose h1, -.prose heading-1 h2, -.prose heading-2 { - margin-bottom: 15px; +.icon-money:before { + content: "\f0d6"; } -.prose h3, -.prose heading-3 { - margin-bottom: 10px; +.icon-caret-down:before { + content: "\f0d7"; } -.table-chunky td, -.table-chunky th { - padding: 12px 15px; - font-size: 12px; +.icon-caret-up:before { + content: "\f0d8"; } -.table-chunky thead th, -.table-chunky thead td { - color: #ffffff; - background-color: #aaaaaa; - padding-top: 10px; - padding-bottom: 10px; +.icon-caret-left:before { + content: "\f0d9"; } -.table-striped tbody tr:nth-child(odd) td, -.table-striped tbody tr:nth-child(odd) th { - background-color: transparent; +.icon-caret-right:before { + content: "\f0da"; } -.table-striped tbody tr:nth-child(even) td, -.table-striped tbody tr:nth-child(even) th { - background-color: #f2f2f2; +.icon-columns:before { + content: "\f0db"; } -.table-chunky.table-bordered { - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; +.icon-sort:before { + content: "\f0dc"; } -.table-chunky.table-bordered thead:first-child tr:first-child th:first-child, -.table-chunky.table-bordered tbody:first-child tr:first-child td:first-child { - -webkit-border-top-left-radius: 2px; - -moz-border-radius-topleft: 2px; - border-top-left-radius: 2px; +.icon-sort-down:before { + content: "\f0dd"; } -.table-chunky.table-bordered thead:first-child tr:first-child th:last-child, -.table-chunky.table-bordered tbody:first-child tr:first-child td:last-child { - -webkit-border-top-right-radius: 2px; - -moz-border-radius-topright: 2px; - border-top-right-radius: 2px; +.icon-sort-up:before { + content: "\f0de"; } -.table-chunky.table-bordered thead:last-child tr:last-child th:first-child, -.table-chunky.table-bordered tbody:last-child tr:last-child td:first-child { - -webkit-border-radius: 0 0 0 2px; - -moz-border-radius: 0 0 0 2px; - border-radius: 0 0 0 2px; - -webkit-border-bottom-left-radius: 2px; - -moz-border-radius-bottomleft: 2px; - border-bottom-left-radius: 2px; +.icon-envelope-alt:before { + content: "\f0e0"; } -.table-chunky.table-bordered thead:last-child tr:last-child th:last-child, -.table-chunky.table-bordered tbody:last-child tr:last-child td:last-child { - -webkit-border-bottom-right-radius: 2px; - -moz-border-radius-bottomright: 2px; - border-bottom-right-radius: 2px; +.icon-linkedin:before { + content: "\f0e1"; } -.ckan-icon { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; +.icon-undo:before { + content: "\f0e2"; } -.ckan-icon:last-child { - *margin-left: 0; +.icon-legal:before { + content: "\f0e3"; } -.ckan-icon-fb { - width: 16px; - height: 16px; - background-position: 0px 0; +.icon-dashboard:before { + content: "\f0e4"; } -.ckan-icon-gplus { - width: 16px; - height: 16px; - background-position: -16px 0; +.icon-comment-alt:before { + content: "\f0e5"; } -.ckan-icon-twitter { - width: 16px; - height: 16px; - background-position: -32px 0; +.icon-comments-alt:before { + content: "\f0e6"; } -.ckan-icon-email { - width: 16px; - height: 16px; - background-position: -48px 0; +.icon-bolt:before { + content: "\f0e7"; } -.ckan-icon-share { - width: 16px; - height: 16px; - background-position: -64px 0; +.icon-sitemap:before { + content: "\f0e8"; } -.ckan-icon-feed { - width: 16px; - height: 16px; - background-position: -80px 0; +.icon-umbrella:before { + content: "\f0e9"; } -.ckan-icon-calendar { - width: 16px; - height: 16px; - background-position: -96px 0; +.icon-paste:before { + content: "\f0ea"; } -.ckan-icon-file { - width: 16px; - height: 16px; - background-position: -112px 0; +.icon-lightbulb:before { + content: "\f0eb"; } -.ckan-icon-lock { - width: 16px; - height: 16px; - background-position: -128px 0; +.icon-exchange:before { + content: "\f0ec"; } -.ckan-icon-link-file { - width: 16px; - height: 16px; - background-position: -144px 0; +.icon-cloud-download:before { + content: "\f0ed"; } -.ckan-icon-link-plugin { - width: 16px; - height: 16px; - background-position: -160px 0; +.icon-cloud-upload:before { + content: "\f0ee"; } -.ckan-icon-upload-file { - width: 16px; - height: 16px; - background-position: -176px 0; +.icon-user-md:before { + content: "\f0f0"; } -.ckan-icon-callout { - width: 16px; - height: 16px; - background-position: -192px 0; +.icon-stethoscope:before { + content: "\f0f1"; } -.ckan-icon-circle-cross { - width: 17px; - height: 17px; - background-position: 0px -16px; +.icon-suitcase:before { + content: "\f0f2"; } -.ckan-icon-circle-add { - width: 17px; - height: 17px; - background-position: -17px -16px; +.icon-bell-alt:before { + content: "\f0f3"; } -.ckan-icon-flame { - width: 17px; - height: 17px; - background-position: -34px -16px; +.icon-coffee:before { + content: "\f0f4"; } -.ckan-icon-search { - width: 17px; - height: 17px; - background-position: -51px -16px; +.icon-food:before { + content: "\f0f5"; } -.ckan-icon-large-lock { - width: 20px; - height: 20px; - background-position: 0px -33px; +.icon-file-alt:before { + content: "\f0f6"; } -.ckan-icon-photo { - width: 20px; - height: 20px; - background-position: -20px -33px; +.icon-building:before { + content: "\f0f7"; } -.ckan-icon-add { - width: 20px; - height: 20px; - background-position: -40px -33px; +.icon-hospital:before { + content: "\f0f8"; } -.ckan-icon-home { - width: 20px; - height: 20px; - background-position: -60px -33px; +.icon-ambulance:before { + content: "\f0f9"; } -.ckan-icon-rewind { - width: 20px; - height: 20px; - background-position: -80px -33px; +.icon-medkit:before { + content: "\f0fa"; +} +.icon-fighter-jet:before { + content: "\f0fb"; +} +.icon-beer:before { + content: "\f0fc"; +} +.icon-h-sign:before { + content: "\f0fd"; +} +.icon-plus-sign-alt:before { + content: "\f0fe"; } -.ckan-icon-tools { - width: 20px; - height: 20px; - background-position: -100px -33px; +.icon-double-angle-left:before { + content: "\f100"; } -.ckan-icon-flag { - width: 20px; - height: 20px; - background-position: -120px -33px; +.icon-double-angle-right:before { + content: "\f101"; } -.ckan-icon-clipboard { - width: 20px; - height: 20px; - background-position: -140px -33px; +.icon-double-angle-up:before { + content: "\f102"; } -.ckan-icon-share { - width: 20px; - height: 20px; - background-position: -160px -33px; +.icon-double-angle-down:before { + content: "\f103"; } -.ckan-icon-info { - width: 20px; - height: 20px; - background-position: -180px -33px; +.icon-angle-left:before { + content: "\f104"; } -.ckan-icon-download { - width: 20px; - height: 20px; - background-position: -200px -33px; +.icon-angle-right:before { + content: "\f105"; } -.ckan-icon-star { - width: 20px; - height: 20px; - background-position: -220px -33px; +.icon-angle-up:before { + content: "\f106"; } -.ckan-icon-info-flat { - width: 20px; - height: 20px; - background-position: -240px -33px; +.icon-angle-down:before { + content: "\f107"; } -.ckan-icon-tag { - width: 20px; - height: 20px; - background-position: -260px -33px; +.icon-desktop:before { + content: "\f108"; } -.ckan-icon-plus { - width: 20px; - height: 20px; - background-position: -280px -33px; - width: 16px; +.icon-laptop:before { + content: "\f109"; } -.ckan-icon-head { - width: 20px; - height: 20px; - background-position: -300px -33px; +.icon-tablet:before { + content: "\f10a"; } -.ckan-icon-arrow-e { - width: 20px; - height: 20px; - background-position: -320px -33px; - width: 16px; +.icon-mobile-phone:before { + content: "\f10b"; } -.ckan-icon-bookmark { - width: 25px; - height: 25px; - background-position: 0px -53px; +.icon-circle-blank:before { + content: "\f10c"; } -.format-label { - *margin-right: .3em; - display: inline-block; - vertical-align: text-bottom; - position: relative; - top: 2px; - width: 16px; - height: 16px; - background-image: url("../../../base/images/sprite-ckan-icons.png"); - background-repeat: no-repeat; - background-position: 16px 16px; - text-indent: -900em; - background: url("../../../base/images/sprite-resource-icons.png") no-repeat 0 0; +.icon-quote-left:before { + content: "\f10d"; } -.format-label:last-child { - *margin-left: 0; +.icon-quote-right:before { + content: "\f10e"; } -.format-label { - width: 32px; - height: 35px; - background-position: 0px -62px; +.icon-spinner:before { + content: "\f110"; } -.format-label[data-format=rdf], -.format-label[data-format*=rdf] { - width: 32px; - height: 35px; - background-position: -32px -62px; +.icon-circle:before { + content: "\f111"; } -.format-label[data-format=pdf], -.format-label[data-format*=pdf] { - width: 32px; - height: 35px; - background-position: -64px -62px; +.icon-reply:before { + content: "\f112"; } -.format-label[data-format=api], -.format-label[data-format*=api] { - width: 32px; - height: 35px; - background-position: -96px -62px; +.icon-github-alt:before { + content: "\f113"; } -.format-label[data-format=zip], -.format-label[data-format*=zip] { - width: 32px; - height: 35px; - background-position: -128px -62px; +.icon-folder-close-alt:before { + content: "\f114"; } -.format-label[data-format=xls], -.format-label[data-format*=xls] { - width: 32px; - height: 35px; - background-position: -160px -62px; +.icon-folder-open-alt:before { + content: "\f115"; } -.format-label[data-format=csv], -.format-label[data-format*=csv] { - width: 32px; - height: 35px; - background-position: -192px -62px; +[class^="icon-"], +[class*=" icon-"] { + display: inline-block; + text-align: right; + font-size: 14px; + line-height: 1; + width: 14px; } -.format-label[data-format=txt], -.format-label[data-format*=txt] { - width: 32px; - height: 35px; - background-position: -224px -62px; +.btn [class^="icon-"], +.nav [class^="icon-"], +.module-heading [class^="icon-"], +.dropdown [class^="icon-"], +.btn [class*=" icon-"], +.nav [class*=" icon-"], +.module-heading [class*=" icon-"], +.dropdown [class*=" icon-"] { + margin-right: 4px; } -.format-label[data-format=xml], -.format-label[data-format*=xml] { - width: 32px; - height: 35px; - background-position: -256px -62px; +.info-block [class^="icon-"], +.info-block [class*=" icon-"] { + float: left; + font-size: 28px; + width: 28px; + margin-right: 5px; + margin-top: 2px; } -.format-label[data-format=json], -.format-label[data-format*=json] { - width: 32px; - height: 35px; - background-position: -288px -62px; +.breadcrumb .home .icon-home { + font-size: 24px; + width: 24px; + vertical-align: -1px; } -.format-label[data-format=html], -.format-label[data-format*=html] { - width: 32px; - height: 35px; - background-position: -320px -62px; +.info-block-small [class^="icon-"], +.info-block-small [class*=" icon-"] { + font-size: 14px; + width: 14px; + margin-top: 1px; } -li [class^="icon-"], -li [class*=" icon-"] { - width: auto; +.wrapper { + *zoom: 1; + background-color: #FFF; + border: 1px solid #cccccc; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.05); + position: relative; + background: #ffffff url("../../../base/images/nav.png") 0 0 repeat-y; + margin-bottom: 20px; } -li .icon-large:before, -li .icon-large:before { - width: auto; +.wrapper:before, +.wrapper:after { + display: table; + content: ""; + line-height: 0; +} +.wrapper:after { + clear: both; +} +.wrapper.no-nav { + background-image: none; } [role=main], .main { position: relative; - padding-top: 27px; - padding-bottom: 27px; - background-color: #efefef; + padding-top: 10px; + padding-bottom: 20px; + background: #eeeeee url("../../../base/images/bg.png"); } [role=main] { min-height: 350px; } .main:after, -.main:before, -[role=main]:after, -[role=main]:before { - content: ""; - position: absolute; - left: 0; - right: 0; - height: 7px; - background: #ffffff; - border-color: #c9c9c9; - border-style: solid; - border-width: 0; -} -.main:before, -[role=main]:before { - top: 0; - border-bottom-width: 1px; -} -.main:after, [role=main]:after { bottom: 0; border-top-width: 1px; } [role=main] .primary { - float: left; - margin-left: 20px; - width: 700px; + width: 717px; float: right; } [role=main] .secondary { - float: left; margin-left: 20px; width: 220px; margin-left: 0; float: left; } -.primary > :last-child, -.secondary > :last-child { - margin-bottom: 0; +.primary > :last-child, +.secondary > :last-child { + margin-bottom: 0; +} +.primary .primary { + float: left; + width: 467px; + margin-left: 0; + margin-bottom: 20px; +} +.primary .primary h1:first-child, +.primary .primary h2:first-child, +.primary .primary h3:first-child, +.primary .primary h4:first-child { + margin-top: 0; +} +.primary .tertiary { + float: left; + width: 180px; + margin-left: 20px; + margin-bottom: 20px; +} +.hero { + background: url("../../../base/images/background-tile.png"); +} +.hero:after { + background-color: rgba(0, 0, 0, 0.09); + background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: -ms-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0.15)), to(rgba(0, 0, 0, 0))); + background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-image: linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); + background-repeat: repeat-x; + background-color: #f6f6f6; + border-bottom: 1px solid #d0d0d0; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; + -webkit-box-shadow: inset 0 -4px 0 rgba(0, 0, 0, 0.03); + -moz-box-shadow: inset 0 -4px 0 rgba(0, 0, 0, 0.03); + box-shadow: inset 0 -4px 0 rgba(0, 0, 0, 0.03); +} +.hero:after .back:hover { + text-decoration: none; +} +.hero:after .back:hover span { + text-decoration: underline; +} +.context-info .module-content { + padding: 15px; +} +.context-info .image { + margin-bottom: 10px; +} +.context-info .image img, +.context-info .image a { + display: block; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.context-info p { + overflow: auto; +} +.context-info code { + display: block; + font-weight: normal; + padding: 0; + margin: 0; + overflow: auto; +} +.context-info h1.heading { + margin: 0 0 5px 0; + font-size: 18px; + line-height: 1.3; +} +.context-info .info { + margin-top: 15px; + padding-top: 10px; + border-top: 1px dotted #DDD; +} +.context-info .info dl dd { + margin-top: 3px; + margin-left: 0; +} +.context-info .nums { + *zoom: 1; + margin-top: 15px; + padding-top: 10px; + padding-bottom: 0; + border-top: 1px dotted #DDD; +} +.context-info .nums:before, +.context-info .nums:after { + display: table; + content: ""; + line-height: 0; +} +.context-info .nums:after { + clear: both; +} +.context-info .nums dl { + float: left; + width: 50%; + margin: 5px 0 0 0; + color: #444444; +} +.context-info .nums dl dt { + display: block; + font-size: 13px; + font-weight: 300; +} +.context-info .nums dl dd { + display: block; + font-size: 30px; + font-weight: 700; + line-height: 36px; + margin-left: 0; +} +.context-info .nums dl dd .smallest { + font-size: 13px; +} +.context-info .nums dl dd .smaller { + font-size: 16px; } -.hero { - background: url("../../../base/images/background-tile.png"); +.context-info .nums dl dd .small { + font-size: 21px; } -.hero:after { - background-color: rgba(0, 0, 0, 0.09); - background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: -ms-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0.15)), to(rgba(0, 0, 0, 0))); - background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-image: linear-gradient(top, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0)); - background-repeat: repeat-x; - background-color: transparent; - top: 7px; - bottom: auto; - height: 5px; +.context-info .follow_button { + margin-top: 15px; +} +.context-info.editing .module-content { + margin-top: 0; } .hero { - padding-bottom: 0; + background: url("../../../base/images/background-tile.png"); + padding: 20px 0; min-height: 0; } .hero > .container { position: relative; padding-bottom: 0; } -.hero-primary, -.hero-secondary { - float: left; - margin-left: 20px; - width: 460px; -} -.hero-primary { - margin-left: 0; -} -.hero-primary { - margin-left: 0; - margin-bottom: 0; -} -.hero-secondary { - position: absolute; - bottom: 0; - right: 0; -} -.hero-secondary-inner { - bottom: 0; - left: 0; - right: 0; -} -.hero .module-popup { - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; - margin-top: 50px; +.hero .search-giant { + margin-bottom: 10px; } -.hero .module-popup .module-content { - padding-bottom: 2px; +.hero .search-giant input { + border-color: #003f52; } .hero .page-heading { font-size: 18px; @@ -6734,290 +7984,339 @@ li .icon-large:before { } .hero .module-dark { padding: 5px; - margin-bottom: 10px; + margin-bottom: 0; color: #ffffff; background: #ffffff; } .hero .module-dark .module-content { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - background-color: #dc0b0b; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; + background-color: #c14531; + border-bottom: none; } .hero .module-dark .module-content .heading { + margin-top: 0; margin-bottom: 7px; + font-size: 24px; + line-height: 40px; } .hero .tags { - margin-bottom: 9px; -} -.hero .tags .tag, -.hero .tags .tag-list { - display: inline-block; -} -.hero .tags .tag-list { - padding: 0; -} -.hero .tags .tag { - margin-right: 15px; -} -header.masthead { *zoom: 1; - color: #ffffff; - padding: 5px 10px 3px; - height: 55px; - background-color: #e51212; - background-image: -moz-linear-gradient(top, #dc0b0b, #f31d1d); - background-image: -ms-linear-gradient(top, #dc0b0b, #f31d1d); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#dc0b0b), to(#f31d1d)); - background-image: -webkit-linear-gradient(top, #dc0b0b, #f31d1d); - background-image: -o-linear-gradient(top, #dc0b0b, #f31d1d); - background-image: linear-gradient(top, #dc0b0b, #f31d1d); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dc0b0b', endColorstr='#f31d1d', GradientType=0); + padding: 5px 10px 10px 10px; + background-color: #983627; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; } -header.masthead:before, -header.masthead:after { +.hero .tags:before, +.hero .tags:after { display: table; content: ""; + line-height: 0; } -header.masthead:after { +.hero .tags:after { clear: both; } -header.masthead .container { - position: relative; +.hero .tags h3, +.hero .tags .tag { + display: block; + float: left; + margin: 5px 10px 0 0; } -header.masthead a { - color: #ffffff; +.hero .tags h3 { + font-size: 14px; + line-height: 20px; + padding: 2px 8px; } -header.masthead hgroup h1, -header.masthead hgroup h2 { +.hero-primary, +.hero-secondary { float: left; - font-size: 34px; - line-height: 1.5; -} -header.masthead hgroup h1 { - font-weight: 900; - letter-spacing: -1px; + margin-left: 20px; + width: 460px; } -header.masthead hgroup h2 { - position: absolute; - bottom: -3px; - left: 0; - margin: 0; - font-size: 15px; - font-weight: normal; - line-height: 1.2; - white-space: nowrap; +.hero-primary { + margin-left: 0; + margin-bottom: 0; } -header.masthead .content { +.hero-secondary { position: absolute; - top: 10px; + bottom: 0; right: 0; } -header.masthead .section { - float: left; +.hero-secondary .hero-secondary-inner { + bottom: 0; + left: 0; + right: 0; } -header.masthead .navigation { - margin-right: 20px; +.main.homepage { + padding-top: 20px; + padding-bottom: 20px; + border-top: 1px solid #cccccc; } -header.masthead .navigation ul.unstyled { - *zoom: 1; - margin: 5px 0; +.main.homepage .module-heading .media-image { + margin-right: 15px; + max-height: 53px; + -webkit-box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.5); + -moz-box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.5); + box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.5); } -header.masthead .navigation ul.unstyled:before, -header.masthead .navigation ul.unstyled:after { - display: table; - content: ""; +.main.homepage .group-listing .box { + min-height: 275px; } -header.masthead .navigation ul.unstyled:after { - clear: both; +.main.homepage .group-list { + margin-bottom: 0; } -header.masthead .navigation ul.unstyled li { - display: block; - float: left; +.main.homepage .group-list .dataset-content { + min-height: 70px; } -header.masthead .navigation ul.unstyled li a { - display: block; - font-size: 12px; - font-weight: bold; - padding: 4px 10px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; +.main.homepage .box .module { + margin-top: 0; } -header.masthead .navigation ul.unstyled li a.active { - background-color: #de1717; - box-shadow: 0 -1px 0 #b01212, 0 1px 0 #e13030; +.account-masthead { + *zoom: 1; + min-height: 30px; + color: #ffffff; + background: #983627 url("../../../base/images/bg.png"); } -header.masthead .site-search { - margin: 3px 0; +.account-masthead:before, +.account-masthead:after { + display: table; + content: ""; + line-height: 0; } -header.masthead .site-search input { - width: 190px; - font-size: 11px; - padding: 4px; +.account-masthead:after { + clear: both; } -header.masthead .account { - background: #ea0c0c; - padding: 3px 5px; - margin: 2px 0 2px 30px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 2px 4px #d20b0b; - -moz-box-shadow: inset 0 2px 4px #d20b0b; - box-shadow: inset 0 2px 4px #d20b0b; +.account-masthead .account { + float: right; } -header.masthead .account ul.unstyled { +.account-masthead .account ul { *zoom: 1; } -header.masthead .account ul.unstyled:before, -header.masthead .account ul.unstyled:after { +.account-masthead .account ul:before, +.account-masthead .account ul:after { display: table; content: ""; + line-height: 0; } -header.masthead .account ul.unstyled:after { +.account-masthead .account ul:after { clear: both; } -header.masthead .account ul.unstyled li { +.account-masthead .account ul li { display: block; float: left; + border-left: 1px solid #842f22; } -header.masthead .account ul.unstyled li a { +.account-masthead .account ul li a { display: block; - font-size: 12px; + color: #f0d1cc; + font-size: 13px; font-weight: bold; - padding: 4px 10px; + padding: 0 10px; + line-height: 31px; +} +.account-masthead .account ul li a span.username { + margin: 0 2px 0 4px; } -header.masthead .account ul.unstyled li a.sub { +.account-masthead .account ul li a:hover { + color: #f6e3e0; + background-color: #842f22; + text-decoration: none; +} +.account-masthead .account ul li a.sub { font-weight: 300; - border-left: 1px solid #d20b0b; } -header.masthead .account .dropdown { - float: left; +.account-masthead .account ul li a .btn { + vertical-align: 1px; + margin-left: 3px; } -header.masthead .account .button { - display: block; - text-decoration: none; - background-color: #dc0b0b; - color: #ee8585; - text-shadow: 0 1px 1px #ab0909; +.account-masthead .account .notifications a span { + font-size: 12px; + margin-left: 3px; + padding: 1px 6px; + background-color: #842f22; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 #f30e0e; - -moz-box-shadow: inset 0 1px 0 #f30e0e; - box-shadow: inset 0 1px 0 #f30e0e; } -header.masthead .account .image { - margin: 2px 0; - padding: 0 4px 0 0; - overflow: hidden; - font-size: 10px; +.account-masthead .account .notifications a:hover span { + color: #ffffff; + background-color: #70281c; +} +.account-masthead .account .notifications.notifications-important a span { + color: #ffffff; + background-color: #c9403a; +} +.account-masthead .account.authed .image { + padding: 0 6px; +} +.account-masthead .account.authed .image img { + vertical-align: -6px; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; } -header.masthead .account .image i { - vertical-align: -1px; +.masthead { + *zoom: 1; + min-height: 55px; + color: #ffffff; + background: #c14531 url("../../../base/images/bg.png"); } -header.masthead .account .image img { - opacity: 0.7; - border-right: 1px solid #f31d1d; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; +.masthead:before, +.masthead:after { + display: table; + content: ""; + line-height: 0; +} +.masthead:after { + clear: both; } -header.masthead .account .notifications { - padding: 4px 8px 3px 8px; - margin: 2px 5px 2px 0; +.masthead .container { + position: relative; } -header.masthead .account .notifications.notifications-important { +.masthead a { color: #ffffff; - background-color: #c9403a; - text-shadow: 0 1px 1px #a3322d; - -webkit-box-shadow: inset 0 1px 0 #ce534e; - -moz-box-shadow: inset 0 1px 0 #ce534e; - box-shadow: inset 0 1px 0 #ce534e; } -header.masthead .account .dropdown.open .image img, -header.masthead .account .dropdown .image:hover img { - opacity: 1; - border-right-color: #f64d4d; +.masthead hgroup h1, +.masthead hgroup h2 { + float: left; + font-size: 30px; + line-height: 1.5; } -header.masthead .account .dropdown.open .button, -header.masthead .account .dropdown .button:hover { - color: #ffffff; - background-color: #ea6d6d; - -webkit-box-shadow: inset 0 1px 0 #ee8585; - -moz-box-shadow: inset 0 1px 0 #ee8585; - box-shadow: inset 0 1px 0 #ee8585; - text-decoration: none; +.masthead hgroup h1 { + font-weight: 900; + letter-spacing: -1px; + margin: 3px 0; +} +.masthead hgroup h2 { + position: absolute; + bottom: -3px; + left: 0; + margin: 0; + font-size: 15px; + font-weight: normal; + line-height: 1.2; + white-space: nowrap; } -header.masthead .account .dropdown.open .notifications-important, -header.masthead .account .dropdown .notifications-important:hover { - background-color: #d46762; - text-shadow: 0 1px 1px #c9403a; - -webkit-box-shadow: inset 0 1px 0 #d97a76; - -moz-box-shadow: inset 0 1px 0 #d97a76; - box-shadow: inset 0 1px 0 #d97a76; +.masthead .content { + position: absolute; + top: 10px; + right: 0; } -header.masthead .account.authed { - margin: 0 0 0 30px; +.masthead .section { + float: left; } -header.masthead .account.not-authed { - padding-top: 2px; - padding-bottom: 2px; +.masthead input[type="text"] { + border-color: #ad3e2c; } -header.masthead .dropdown-menu { - margin-top: -1px; +.masthead .navigation { + margin-right: 20px; } -header.masthead .user-dropdown-menu a { - color: #dc0b0b; +.masthead .navigation .nav-pills { + margin-bottom: 0; } -header.masthead .user-dropdown-menu a:hover { - color: #ffffff; +.masthead .navigation .nav-pills li a:hover, +.masthead .navigation .nav-pills li.active a { + background-color: #983627; } -header.masthead .debug { +.masthead .site-search { + margin: 2px 8px 2px 0; +} +.masthead .site-search input { + width: 200px; + padding: 4px 10px; +} +.masthead .debug { position: absolute; - bottom: 10px; + top: 37px; left: 10px; - font-size: 11px; color: rgba(255, 255, 255, 0.5); - line-height: 1.2; } .site-footer { *zoom: 1; + min-height: 55px; color: #ffffff; - padding: 5px 10px 3px; - height: 55px; - background-color: #e51212; - background-image: -moz-linear-gradient(top, #dc0b0b, #f31d1d); - background-image: -ms-linear-gradient(top, #dc0b0b, #f31d1d); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#dc0b0b), to(#f31d1d)); - background-image: -webkit-linear-gradient(top, #dc0b0b, #f31d1d); - background-image: -o-linear-gradient(top, #dc0b0b, #f31d1d); - background-image: linear-gradient(top, #dc0b0b, #f31d1d); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dc0b0b', endColorstr='#f31d1d', GradientType=0); - font-size: 12px; + background: #c14531 url("../../../base/images/bg.png"); padding: 20px 0; } .site-footer:before, .site-footer:after { display: table; content: ""; + line-height: 0; } .site-footer:after { clear: both; } +.site-footer .container { + position: relative; +} +.site-footer a { + color: #ffffff; +} +.site-footer hgroup h1, +.site-footer hgroup h2 { + float: left; + font-size: 30px; + line-height: 1.5; +} +.site-footer hgroup h1 { + font-weight: 900; + letter-spacing: -1px; + margin: 3px 0; +} +.site-footer hgroup h2 { + position: absolute; + bottom: -3px; + left: 0; + margin: 0; + font-size: 15px; + font-weight: normal; + line-height: 1.2; + white-space: nowrap; +} +.site-footer .content { + position: absolute; + top: 10px; + right: 0; +} +.site-footer .section { + float: left; +} +.site-footer input[type="text"] { + border-color: #ad3e2c; +} +.site-footer .navigation { + margin-right: 20px; +} +.site-footer .navigation .nav-pills { + margin-bottom: 0; +} +.site-footer .navigation .nav-pills li a:hover, +.site-footer .navigation .nav-pills li.active a { + background-color: #983627; +} +.site-footer .site-search { + margin: 2px 8px 2px 0; +} +.site-footer .site-search input { + width: 200px; + padding: 4px 10px; +} +.site-footer .debug { + position: absolute; + top: 37px; + left: 10px; + color: rgba(255, 255, 255, 0.5); +} .site-footer, .site-footer label, .site-footer small { - color: #ccdee3; + color: #e6b5ad; } .site-footer a { - color: #ccdee3; + color: #e6b5ad; } .footer-links, .attribution { @@ -7025,22 +8324,27 @@ header.masthead .debug { margin-left: 20px; width: 460px; } -.footer-links { +.footer-links { + margin-left: 0; +} +.footer-links ul { + float: left; + margin-left: 20px; + width: 220px; +} +.footer-links ul:first-child { margin-left: 0; } -.footer-links li { - display: inline-block; - width: 40%; - margin-right: 5%; +.footer-links ul li { margin-bottom: 5px; } .attribution small { - color: #ccdee3; + color: #e6b5ad; font-size: 12px; } .attribution .ckan-footer-logo { display: block; - width: 65px; + width: 68px; height: 21px; margin-top: 2px; background: url("../../../base/images/ckan-logo-footer.png") no-repeat top left; @@ -7053,6 +8357,7 @@ header.masthead .debug { .lang-select:after { display: table; content: ""; + line-height: 0; } .lang-select:after { clear: both; @@ -7069,153 +8374,66 @@ header.masthead .debug { .lang-dropdown li { width: auto; } -.lang-dropdown .select2-result-label[data-value]:before { - content: ""; - display: inline-block; - background-image: url("../../../base/images/flags.png"); - background-repeat: no-repeat; - background-position: 0 11px; - width: 17px; - height: 11px; - position: relative; - top: 1px; -} -.lang-dropdown .select2-result-label[data-value*="/en/"]:before { - background-position: 0 0; -} -.lang-dropdown .select2-result-label[data-value*="/de/"]:before { - background-position: 0 -11px; -} -.lang-dropdown .select2-result-label[data-value*="/fr/"]:before { - background-position: 0 -22px; -} -.lang-dropdown .select2-result-label[data-value*="/it/"]:before { - background-position: 0 -33px; -} -.lang-dropdown .select2-result-label[data-value*="/es/"]:before { - background-position: 0 -44px; -} -.lang-dropdown .select2-result-label[data-value*="/pl/"]:before { - background-position: 0 -55px; +.table-selected td { + background-color: #f5f5f5; } -.lang-dropdown .select2-result-label[data-value*="/ru/"]:before { - background-position: 0 -66px; +.table-selected td .edit { + display: block; } -.lang-dropdown .select2-result-label[data-value*="/nl/"]:before { - background-position: 0 -77px; +.table-bulk-edit th input { + top: -5px; } -.lang-dropdown .select2-result-label[data-value*="/sv/"]:before { - background-position: 0 -88px; +.table-bulk-edit .table-actions .btn-group { + float: left; + margin: 0 10px 0 0; } -.lang-dropdown .select2-result-label[data-value*="/no/"]:before { - background-position: 0 -99px; +.table-bulk-edit .context p { + margin-bottom: 0; } -.lang-dropdown .select2-result-label[data-value*="/cs/"]:before, -.lang-dropdown .select2-result-label[data-value*="/cs_CZ/"]:before { - background-position: 0 -110px; +.table-header thead th { + background-color: #f6f6f6; } -.lang-dropdown .select2-result-label[data-value*="/hu/"]:before { - background-position: 0 -121px; +.table-edit-hover .edit { + display: none; + float: right; } -.lang-dropdown .select2-result-label[data-value*="/pt_BR/"]:before { - background-position: 0 -132px; +.table-edit-hover tr:hover .edit { + display: block; } -.lang-dropdown .select2-result-label[data-value*="/fi/"]:before { - background-position: 0 -143px; +.js .table-toggle-more .toggle-more { + display: none; } -.lang-dropdown .select2-result-label[data-value*="/bg/"]:before { - background-position: 0 -154px; +.js .table-toggle-more .show-more { + display: inline; } -.lang-dropdown .select2-result-label[data-value*="/ca/"]:before { - background-position: 0 -165px; +.js .table-toggle-more .show-less { + display: none; } -.lang-dropdown .select2-result-label[data-value*="/sq/"]:before { - background-position: 0 -176px; +.js .table-toggle-more .toggle-seperator { + display: table-row; } -.lang-dropdown .select2-result-label[data-value*="/sr/"]:before, -.lang-dropdown .select2-result-label[data-value*="/sr_Latn/"]:before { - background-position: 0 -187px; +.js .table-toggle-more .toggle-seperator td { + height: 11px; + padding: 0; + background-image: url("../../../base/images/table-seperator.png"); } -.lang-dropdown .select2-result-label[data-value*="/zh_TW/"]:before { - background-position: 0 -198px; +.js .table .toggle-show td { + background: none; + text-align: center; } -.lang-dropdown .select2-result-label[data-value*="/lv/"]:before { - background-position: 0 -209px; +.js .table-toggle-less .show-less { + display: inline; } -.lang-dropdown .select2-result-label[data-value*="/sk/"]:before { - background-position: 0 -220px; +.js .table-toggle-less .show-more { + display: none; } -.lang-dropdown .select2-result-label[data-value*="/pt_BR/"]:before { - background-position: 0 -132px; +.js .table-toggle-less .toggle-seperator { + display: none; } .profile .empty, .profile .dataset-list { margin-bottom: 20px; } -.profile-info .module-content { - padding: 15px; -} -.profile-info .avatar { - border: 1px solid #DDD; - padding: 5px; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; -} -.profile-info .avatar img, -.profile-info .avatar a { - display: block; -} -.profile-info code { - font-weight: normal; - padding: 0; - margin: 0; -} -.profile-info h1.heading { - margin: 10px 0 5px 0; - font-size: 21px; -} -.profile-info .info { - margin-top: 15px; - padding-top: 10px; - border-top: 1px dotted #DDD; -} -.profile-info .info dl dd { - margin-top: 3px; - margin-left: 0; -} -.profile-info .nums { - *zoom: 1; - margin-top: 15px; - padding-top: 10px; - padding-bottom: 0; - border-top: 1px dotted #DDD; -} -.profile-info .nums:before, -.profile-info .nums:after { - display: table; - content: ""; -} -.profile-info .nums:after { - clear: both; -} -.profile-info .nums dl { - float: left; - width: 33%; - margin: 5px 0 0 0; - color: #4d4d4d; -} -.profile-info .nums dl dt { - display: block; - font-weight: 300; -} -.profile-info .nums dl dd { - display: block; - font-size: 30px; - font-weight: 700; - line-height: 1.2; - margin-left: 0; -} .activity { margin: 10px 0; padding: 0; @@ -7232,13 +8450,16 @@ header.masthead .debug { .activity .item:after { display: table; content: ""; + line-height: 0; } .activity .item:after { clear: both; } -.activity .item i { +.activity .item .icon { display: block; - float: left; + position: absolute; + top: 0; + left: 0; width: 30px; height: 30px; line-height: 30px; @@ -7246,7 +8467,6 @@ header.masthead .debug { color: #ffffff; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); font-weight: normal; - font-size: 16px; margin-right: 10px; -webkit-border-radius: 100px; -moz-border-radius: 100px; @@ -7261,20 +8481,19 @@ header.masthead .debug { border-radius: 100px; } .activity .item .actor .gravatar { - float: left; - margin-top: -5px; - margin-right: 10px; + position: absolute; + top: 0; + left: 40px; } .activity .item p { font-size: 14px; line-height: 1.5; - margin: 5px 0 0 0; + margin: 5px 0 0 80px; } .activity .item .date { color: #999; font-size: 12px; white-space: nowrap; - margin-left: 5px; } .activity .item .new { display: block; @@ -7294,106 +8513,278 @@ header.masthead .debug { -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } -.popover .about { - margin-bottom: 10px; +.activity .load-less { + margin-bottom: 15px; +} +.popover { + width: 300px; +} +.popover .popover-title { + font-weight: bold; + margin-bottom: 0; +} +.popover p.about { + margin: 0 0 10px 0; } .popover .popover-close { float: right; text-decoration: none; } -.activity .item i { - background-color: #767dce; +.activity .item .icon { + background-color: #999999; } -.activity .item.added-tag i { +.activity .item.added-tag .icon { background-color: #6995a6; } -.activity .item.changed-group i { +.activity .item.changed-group .icon { background-color: #767dce; } -.activity .item.changed-package i { +.activity .item.changed-package .icon { background-color: #8c76ce; } -.activity .item.changed-package_extra i { +.activity .item.changed-package_extra .icon { background-color: #769ace; } -.activity .item.changed-resource i { +.activity .item.changed-resource .icon { background-color: #aa76ce; } -.activity .item.changed-user i { +.activity .item.changed-user .icon { background-color: #76b8ce; } -.activity .item.deleted-group i { +.activity .item.changed-organization .icon { + background-color: #699fa6; +} +.activity .item.deleted-group .icon { background-color: #b95252; } -.activity .item.deleted-package i { +.activity .item.deleted-package .icon { background-color: #b97452; } -.activity .item.deleted-package_extra i { +.activity .item.deleted-package_extra .icon { background-color: #b95274; } -.activity .item.deleted-resource i { +.activity .item.deleted-resource .icon { background-color: #b99752; } -.activity .item.new-group i { +.activity .item.deleted-organization .icon { + background-color: #b95297; +} +.activity .item.new-group .icon { background-color: #69a67a; } -.activity .item.new-package i { +.activity .item.new-package .icon { background-color: #69a68e; } -.activity .item.new-package_extra i { +.activity .item.new-package_extra .icon { background-color: #6ca669; } -.activity .item.new-resource i { +.activity .item.new-resource .icon { background-color: #81a669; } -.activity .item.new-user i { +.activity .item.new-user .icon { background-color: #69a6a3; } -.activity .item.removed-tag i { +.activity .item.new-organization .icon { + background-color: #81a669; +} +.activity .item.removed-tag .icon { background-color: #b95297; } -.activity .item.deleted-related-item i { +.activity .item.deleted-related-item .icon { background-color: #b9b952; } -.activity .item.follow-dataset i { +.activity .item.follow-dataset .icon { background-color: #767dce; } -.activity .item.follow-user i { +.activity .item.follow-user .icon { background-color: #8c76ce; } -.activity .item.new-related-item i { +.activity .item.new-related-item .icon { background-color: #95a669; } -.activity .item.follow-group i { +.activity .item.follow-group .icon { background-color: #8ba669; } -.popover-context-loading .popover-title { +.dropdown:hover .dropdown-menu { + display: block; +} +.js .dropdown .dropdown-menu, +.js .dropdown:hover .dropdown-menu { + display: none; +} +.js .dropdown.open .dropdown-menu { + display: block; +} +#followee-filter .btn { + *zoom: 1; +} +#followee-filter .btn:before, +#followee-filter .btn:after { + display: table; + content: ""; + line-height: 0; +} +#followee-filter .btn:after { + clear: both; +} +#followee-filter .btn span, +#followee-filter .btn strong { + display: block; + float: left; + line-height: 1.5; +} +#followee-filter .btn span { + font-weight: normal; +} +#followee-filter .btn strong { + margin: 0 5px; + white-space: nowrap; + max-width: 90px; + overflow: hidden; + text-overflow: ellipsis; +} +.dashboard-context { + position: relative; + margin-bottom: 20px; + padding: 20px; + border-bottom: 1px solid #DCDCDC; + background-color: #f6f6f6; + -webkit-border-radius: 3px 0 0 0; + -moz-border-radius: 3px 0 0 0; + border-radius: 3px 0 0 0; +} +.dashboard-context h2 { + margin-bottom: 10px; +} +.dashboard-context .arrow { + position: absolute; + content: ' '; + top: 30px; + right: -10px; + width: 10px; + height: 21px; + background: transparent url("../../../base/images/dashboard-followee-related.png"); +} +.popover-followee .popover-title { display: none; } -.popover-context-loading .popover-content { +.popover-followee .popover-content { + padding: 0; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } -.popover-context-loading .popover-content img { - vertical-align: -3px; - margin-right: 10px; +.popover-followee .empty { + padding: 10px; } -.follower-list li { - margin: 0 0 15px 0; +.popover-followee .popover-header { + *zoom: 1; + background-color: whiteSmoke; + padding: 5px; + border-bottom: 1px solid #cccccc; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } -.follower-list .gravatar { - vertical-align: -4px; - margin-right: 3px; +.popover-followee .popover-header:before, +.popover-followee .popover-header:after { + display: table; + content: ""; + line-height: 0; +} +.popover-followee .popover-header:after { + clear: both; +} +.popover-followee .popover-header .input-prepend { + margin-bottom: 0; +} +.popover-followee .popover-header .add-on, +.popover-followee .popover-header input { + float: left; + margin: 0; +} +.popover-followee .popover-header .add-on { + padding: 4px 8px 4px 12px; + border-right-width: 0; + -webkit-border-radius: 100px 0 0 100px; + -moz-border-radius: 100px 0 0 100px; + border-radius: 100px 0 0 100px; +} +.popover-followee .popover-header input { + padding: 4px 12px 4px 8px; + font-size: 13px; + width: 207px; + -webkit-border-radius: 0 100px 100px 0; + -moz-border-radius: 0 100px 100px 0; + border-radius: 0 100px 100px 0; +} +.popover-followee .nav { + padding: 0; + margin: 0; + max-height: 205px; + overflow: auto; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; +} +.popover-followee .nav li a { + display: block; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + padding: 7px 10px 7px 15px; + margin: 0; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} +.popover-followee .nav li a i { + background-color: #c14531; + color: #ffffff; + margin-right: 11px; + padding: 3px 5px; + line-height: 1; -webkit-border-radius: 100px; -moz-border-radius: 100px; border-radius: 100px; + -webkit-box-shadow: inset 0 1px 2x rgba(0, 0, 0, 0.2); + -moz-box-shadow: inset 0 1px 2x rgba(0, 0, 0, 0.2); + box-shadow: inset 0 1px 2x rgba(0, 0, 0, 0.2); } -.module-my-datasets .empty { - padding: 10px; +.popover-followee .nav li a:hover i { + background-color: #000; +} +.popover-followee .nav li.active a i { + color: #c14531; + background-color: #ffffff; +} +.dashboard-me { + *zoom: 1; + padding: 15px 15px 0 15px; +} +.dashboard-me:before, +.dashboard-me:after { + display: table; + content: ""; + line-height: 0; +} +.dashboard-me:after { + clear: both; +} +.dashboard-me img { + float: left; + margin-right: 10px; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 100px; +} +.dashboard-me strong { + display: block; + font-size: 16px; + margin: 3px 0; } body { - background-color: #f31d1d; + background: #c14531 url("../../../base/images/bg.png"); } [hidden] { display: none; @@ -7412,11 +8803,10 @@ table .metric { width: 140px; } code { - padding: 2px 2px; color: #000000; - font-weight: bold; border: none; background: none; + white-space: normal; } pre { border: none; @@ -7446,10 +8836,11 @@ iframe { text-indent: -999em; } .empty { - color: #aeaeae; + color: #aaaaaa; font-style: italic; } .page-heading { + margin-top: 0; margin-bottom: 16px; } .m-top { @@ -7492,10 +8883,6 @@ iframe { position: relative; top: -20px; } -.ie .module, -.ie .media-image { - border: 1px solid #cccccc; -} .ie .module-popup { border-bottom: none; } @@ -7519,24 +8906,19 @@ iframe { .ie9 .control-large input { height: 56px; } -.ie9 .module { - -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); - box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); +.ie8 .account-masthead a.image, +.ie8 .account-masthead .username { + white-space: nowrap; } -.ie7 .masthead nav ul li a.active, -.ie8 .masthead nav ul li a.active { - position: relative; - top: -1px; - background-color: #e60b0b; - border-top: 1px solid #cd0a0a; - border-bottom: 1px solid #f30e0e; +.ie9 .homepage .media.module-heading .media-image img, +.ie8 .homepage .media.module-heading .media-image img, +.ie7 .homepage .media.module-heading .media-image img { + width: 85px !important; } -.ie8 .masthead .account a.image { - display: block; - width: 25px; - padding-right: 10px; - white-space: nowrap; +.ie8 .hero .hero-primary.module-popup .box, +.ie7 .hero .hero-primary.module-popup .box { + padding-bottom: 20px !important; + margin-bottom: 0 !important; } .ie7 .alert { position: relative; @@ -7556,6 +8938,7 @@ iframe { .ie7 .tags .tag-list:after { display: table; content: ""; + line-height: 0; } .ie7 .tags .tag-list:after { clear: both; @@ -7569,8 +8952,6 @@ iframe { } .ie7 .tags .tag { display: block; - border: 1px solid #d0d0d0; - background: #f5f5f5; } .ie7 .search-giant input { width: 95%; @@ -7621,6 +9002,9 @@ iframe { .ie7 .stages li .highlight { width: auto; } +.ie7 .account-masthead .account a i { + line-height: 31px; +} .ie7 .masthead { position: relative; z-index: 1; @@ -7632,39 +9016,12 @@ iframe { *zoom: 1; } -.ie7 .masthead nav ul { - margin-top: 5px; -} -.ie7 .masthead nav ul li { - float: left; -} -.ie7 .masthead nav ul li a.active { - position: relative; - top: -1px; - background-color: #e60b0b; - border-top: 1px solid #cd0a0a; - border-bottom: 1px solid #f30e0e; -} .ie7 .masthead .header-image { display: block; } .ie7 .masthead .account .dropdown-menu { z-index: 10000; } -.ie7 .footer-links { - *zoom: 1; -} -.ie7 .footer-links:before, -.ie7 .footer-links:after { - display: table; - content: ""; -} -.ie7 .footer-links:after { - clear: both; -} -.ie7 .footer-links li { - float: left; -} .ie7 .module-narrow .nav-item.image { *zoom: 1; } @@ -7672,6 +9029,7 @@ iframe { .ie7 .module-narrow .nav-item.image:after { display: table; content: ""; + line-height: 0; } .ie7 .module-narrow .nav-item.image:after { clear: both; @@ -7689,11 +9047,13 @@ iframe { } .ie7 .module-heading { *zoom: 1; + position: relative; } .ie7 .module-heading:before, .ie7 .module-heading:after { display: table; content: ""; + line-height: 0; } .ie7 .module-heading:after { clear: both; @@ -7713,3 +9073,22 @@ iframe { position: relative; zoom: 1; } +.ie7 .resource-item { + position: static; + padding-bottom: 1px; +} +.ie7 .resource-item .heading { + position: relative; +} +.ie7 .resource-item .format-label { + left: -48px; +} +.ie7 .resource-item .btn-group { + position: relative; + float: right; + top: -35px; + right: 0; +} +.ie7 .media-overlay .media-heading { + background-color: #000; +} diff --git a/ckan/public/base/javascript/modules/dataset-visibility.js b/ckan/public/base/javascript/modules/dataset-visibility.js new file mode 100644 index 00000000000..5bfa4963bb0 --- /dev/null +++ b/ckan/public/base/javascript/modules/dataset-visibility.js @@ -0,0 +1,32 @@ +/* Dataset visibility toggler + * When no organization is selected in the org dropdown then set visibility to + * public always and disable dropdown + */ +this.ckan.module('dataset-visibility', function ($, _) { + return { + currentValue: false, + options: { + organizations: $('#field-organizations'), + visibility: $('#field-private'), + currentValue: null + }, + initialize: function() { + $.proxyAll(this, /_on/); + this.options.currentValue = this.options.visibility.val(); + this.options.organizations.on('change', this._onOrganizationChange); + this._onOrganizationChange(); + }, + _onOrganizationChange: function() { + var value = this.options.organizations.val(); + if (value) { + this.options.visibility + .prop('disabled', false) + .val(this.options.currentValue); + } else { + this.options.visibility + .prop('disabled', true) + .val('False'); + } + } + }; +}); diff --git a/ckan/public/base/javascript/resource.config b/ckan/public/base/javascript/resource.config index aa4f28371d7..b1a7302d9e8 100644 --- a/ckan/public/base/javascript/resource.config +++ b/ckan/public/base/javascript/resource.config @@ -36,6 +36,7 @@ ckan = modules/activity-stream.js modules/dashboard.js modules/table-toggle-more.js + modules/dataset-visibility.js modules/media-grid.js main = diff --git a/ckan/public/base/less/ckan.less b/ckan/public/base/less/ckan.less index bb30be4356e..f7c108f8734 100644 --- a/ckan/public/base/less/ckan.less +++ b/ckan/public/base/less/ckan.less @@ -6,6 +6,7 @@ @import "nav.less"; @import "forms.less"; @import "dataset.less"; +@import "search.less"; @import "group.less"; @import "toolbar.less"; @import "prose.less"; diff --git a/ckan/public/base/less/dashboard.less b/ckan/public/base/less/dashboard.less index 4e8b047561c..286f72bb968 100644 --- a/ckan/public/base/less/dashboard.less +++ b/ckan/public/base/less/dashboard.less @@ -33,7 +33,7 @@ .arrow { position: absolute; content: ' '; - top: 70px; + top: 30px; right: -10px; width: 10px; height: 21px; @@ -113,3 +113,18 @@ } } } + +.dashboard-me { + .clearfix; + padding: 15px 15px 0 15px; + img { + float: left; + margin-right: 10px; + .border-radius(100px); + } + strong { + display: block; + font-size: 16px; + margin: 3px 0; + } +} diff --git a/ckan/public/base/less/dataset.less b/ckan/public/base/less/dataset.less index d4f4feb2e2d..29b07d6b8a1 100644 --- a/ckan/public/base/less/dataset.less +++ b/ckan/public/base/less/dataset.less @@ -53,152 +53,6 @@ top: 0; } -.results { - margin-bottom: 20px; - padding-bottom: 25px; - border-bottom: 1px dotted @genericBorderColor; -} - -.results strong, -.is-search-title { - display: block; - font-size: 24px; - line-height: 1.3; - color: @layoutBoldColor; - margin-bottom: 10px; -} - -.is-search-title { - margin-bottom: 20px; -} - -// Use a before block to space out the area occupied by the sort select box -// this allows the text content in the strong tag to flow correctly around -// the input. -.results strong:before, -.is-search-title:before { - float: right; - content: " "; - width: 280px; - white-space: pre; -} - -.filter-list { - color: @layoutTextColor; - line-height: 32px; - .pill { - line-height: 21px; - } -} - -.filter-list .extra { - margin-top: 10px; - font-size: 18px; - font-weight: normal; - color: @layoutBoldColor; -} - -.dataset-search { - position: relative; -} - -.search-giant, -.search-normal { - position: relative; -} - -.search-normal { - display: block; - margin-bottom: 0; -} - -.search-giant input { - .box-sizing(border-box); - font-size: 16px; - padding: 14px 10px; - width: 100%; - height: auto; -} - -.search-normal input { - .box-sizing(border-box); - width: 100%; - height: auto; -} - -.search-normal button { - cursor: pointer; - position: absolute; - right: 5px; - top: 50%; - background: transparent; - border: none; - color: #999; - margin-top: -17px; - span { - display: none; - } - &:hover { - color: #000; - } -} - -.search-giant button { - cursor: pointer; - position: absolute; - right: 15px; - top: 50%; - display: block; - border: none; - padding: 0; - margin-top: -17px; - width: 30px; - height: 30px; - background: transparent url("@{imagePath}/icon-search-27x26.png") no-repeat center center; - text-indent: -900em; -} - -.control-order-by { - position: absolute; - bottom: -73px; - right: 0; -} - -.control-order-by label, -.control-order-by select { - display: inline; -} - -.control-order-by select { - width: 160px; -} - -.search-aside { - .control-order-by { - clear: both; - overflow: hidden; - display: block; - position: relative; - bottom: 0; - label { - float: left; - font-weight: normal; - font-size: 12px; - line-height: 20px; - } - select { - float: left; - padding: 2px 4px; - margin: 0; - width: inherit; - font-size: 12px; - height: 20px; - line-height: 20px; - width: 120px; - } - } -} - // Resource List .resource-list { diff --git a/ckan/public/base/less/homepage.less b/ckan/public/base/less/homepage.less index cb5f0eb1188..0aaa8a839ab 100644 --- a/ckan/public/base/less/homepage.less +++ b/ckan/public/base/less/homepage.less @@ -6,8 +6,11 @@ position: relative; padding-bottom: 0; } - .search-giant input { - border-color: darken(@mastheadBackgroundColorEnd, 5); + .search-giant { + margin-bottom: 10px; + input { + border-color: darken(@mastheadBackgroundColorEnd, 5); + } } .page-heading { font-size: 18px; @@ -21,9 +24,12 @@ .module-content { .border-radius(3px 3px 0 0); background-color: @mastheadBackgroundColor; + border-bottom: none; .heading { margin-top: 0; margin-bottom: 7px; + font-size: 24px; + line-height: 40px; } } } diff --git a/ckan/public/base/less/layout.less b/ckan/public/base/less/layout.less index 2ff142b485a..78905c89eee 100644 --- a/ckan/public/base/less/layout.less +++ b/ckan/public/base/less/layout.less @@ -46,8 +46,8 @@ .primary { .primary { float: left; - width: 479px; - margin-left: 20px; + width: 467px; + margin-left: 0; margin-bottom: 20px; h1, h2, h3, h4 { &:first-child { @@ -153,6 +153,9 @@ } } } + .follow_button { + margin-top: 15px; + } &.editing { .module-heading { diff --git a/ckan/public/base/less/media.less b/ckan/public/base/less/media.less index e13ecac93cc..f18c49d0e91 100644 --- a/ckan/public/base/less/media.less +++ b/ckan/public/base/less/media.less @@ -136,3 +136,7 @@ } } } + +.wide .media-item { + width: 186px; +} diff --git a/ckan/public/base/less/module.less b/ckan/public/base/less/module.less index 056569ae10c..a575abcbda4 100644 --- a/ckan/public/base/less/module.less +++ b/ckan/public/base/less/module.less @@ -69,6 +69,12 @@ border-top: 1px solid @moduleHeadingBorderColor; } +.module-content .pagination { + margin-left: -25px; + margin-right: -25px; + margin-bottom: -20px; +} + .module .pagination > ul { .border-radius(0); .box-shadow(none); @@ -225,6 +231,10 @@ } } +.no-nav .module:last-child { + margin-top: 0; +} + .module-image { float: left; width: 50px; diff --git a/ckan/public/base/less/nav.less b/ckan/public/base/less/nav.less index f49b8101c29..44e9e7e7e62 100644 --- a/ckan/public/base/less/nav.less +++ b/ckan/public/base/less/nav.less @@ -1,9 +1,17 @@ -.nav-simple { +.nav-simple, +.nav-aside { .simple-list; // Adds border and padding. padding-bottom: 0; } -.nav-item > a { +.nav-aside { + border-top: 1px dotted #DDD; + border-bottom: 1px dotted #DDD; + margin-bottom: 15px; +} + +.nav-item > a, +.nav-aside li a { color: @navLinkColor; font-size: @baseFontSize; line-height: @baseLineHeight; @@ -11,11 +19,13 @@ padding: 7px @gutterX; } -.nav-item.active { +.nav-item.active, +.nav-aside li.active { background-color: @navActiveBackgroundColor; } -.nav-item.active > a { +.nav-item.active > a, +.nav-aside li.active a { position: relative; color: @navItemActiveTextColor; background-color: @navItemActiveBackgroundColor; @@ -34,28 +44,33 @@ } } -.nav-item.active > a span { +.nav-item.active > a span, +.nav-aside li.active a span { white-space: nowrap; overflow:hidden; display:block; } -.module-narrow .nav-item > a { +.module-narrow .nav-item > a, +.module-narrow .nav-aside li a { padding-left: @gutterSmallX; padding-right: @gutterSmallX; position: relative; } -.module-narrow .nav-item.image { +.module-narrow .nav-item.image, +.module-narrow .nav-aside li.image { position: relative; } -.module-narrow .nav-item.image > a { +.module-narrow .nav-item.image > a, +.module-narrow .nav-aside li.image a { padding-left: @gutterSmallX + 27; padding-right: @gutterSmallX + 27; } -.module-narrow .nav-item.image > img { +.module-narrow .nav-item.image > img, +.module-narrow .nav-aside li.image img { position: absolute; top: 50%; left: @gutterSmallX; diff --git a/ckan/public/base/less/search.less b/ckan/public/base/less/search.less new file mode 100644 index 00000000000..a9e4193eb83 --- /dev/null +++ b/ckan/public/base/less/search.less @@ -0,0 +1,108 @@ +.search-form { + // .clearfix; + margin-bottom: 20px; + padding-bottom: 25px; + border-bottom: 1px dotted @genericBorderColor; + + // Normal search box + .search-input { + position: relative; + margin-bottom: 20px; + input { + .box-sizing(border-box); + margin: 0; + width: 100%; + height: auto; + } + button { + cursor: pointer; + display: block; + position: absolute; + top: 50%; + margin-top: -10px; + right: 10px; + height: 20px; + padding: 0; + border: none; + background: transparent; + span { + display: none; + } + i { + color: @inputBorder; + .transition(color 0.2s ease-in); + } + &:hover i { + color: @inputColor; + } + } + &.search-giant { + input { + font-size: 16px; + padding: 15px; + } + button { + margin-top: -15px; + right: 15px; + height: 30px; + i { + font-size: 28px; + width: 28px; + } + } + } + } + .control-order-by { + float: right; + margin: 0 0 0 15px; + label, + select { + display: inline; + } + select { + width: 160px; + margin: 0; + } + } + h2 { + font-size: 24px; + line-height: 1.3; + color: @layoutBoldColor; + margin-bottom: 0; + } + .filter-list { + color: @layoutTextColor; + line-height: 32px; + margin: 10px 0 0 0; + .pill { + line-height: 21px; + } + .extra { + margin-top: 10px; + font-size: 18px; + font-weight: normal; + color: @layoutBoldColor; + } + } +} + +.tertiary { + .control-order-by { + float: none; + margin: 0; + label { + display: block; + margin-bottom: 5px; + font-weight: normal; + font-size: 12px; + } + select { + display: block; + font-size: 12px; + width: 100%; + } + } + .search-input { + margin-bottom: 10px; + } +} diff --git a/ckan/public/base/less/toolbar.less b/ckan/public/base/less/toolbar.less index 7f43f085d8e..b5b2d4adac8 100644 --- a/ckan/public/base/less/toolbar.less +++ b/ckan/public/base/less/toolbar.less @@ -5,11 +5,8 @@ padding: 5px 0; } -.toolbar .add_action { - .unstyled; - position: absolute; - top: 1px; - right: 0; +.page_primary_action { + margin-bottom: 20px; } .toolbar .breadcrumb { @@ -78,19 +75,25 @@ } .page-header { - position: relative; + .clearfix; border-bottom: 1px solid @moduleHeadingBorderColor; background-color: @moduleHeadingBackgroundColor; - height: 30px; .border-radius(0 3px 0 0); .nav-tabs { - position: absolute; - left: 20px; - bottom: -1px; - margin-bottom: 0; + float: left; + margin-bottom: -1px; li.active a, a:hover { background-color: @moduleBackgroundColor; } } + .content_action { + float: right; + margin-top: -5px; + margin-right: -7px; + } +} + +.no-nav .page-header { + .border-radius(3px 3px 0 0); } diff --git a/ckan/templates/admin/base.html b/ckan/templates/admin/base.html index 83427133f4d..aa7f9daf234 100644 --- a/ckan/templates/admin/base.html +++ b/ckan/templates/admin/base.html @@ -5,21 +5,7 @@ {% block breadcrumb_content %} {% endblock %} -{% block primary_content %} -
- {% block page_header %} -
- -
- {% endblock %} -
- {% block primary_content_inner %} - {% endblock %} -
-
+{% block content_primary_nav %} + {{ h.build_nav_icon('ckanadmin_index', _('Sysadmins')) }} + {{ h.build_nav_icon('ckanadmin_config', _('Config')) }} {% endblock %} diff --git a/ckan/templates/admin/config.html b/ckan/templates/admin/config.html index 7e89ba9e763..0ec27d1e687 100644 --- a/ckan/templates/admin/config.html +++ b/ckan/templates/admin/config.html @@ -22,7 +22,7 @@

{% set about_url = h.url_for(controller='home', action='about') %} {% set home_url = h.url_for(controller='home', action='index') %} - {% set docs_url = "http://docs.ckan.org/{0}/{1}/theming.html".format(request.environ.CKAN_LANG, g.ckan_doc_version) %} + {% set docs_url = "http://docs.ckan.org/en/{0}/theming.html".format(g.ckan_doc_version) %} {% trans %}

Site Title: This is the title of this CKAN instance It appears in various places throughout CKAN.

diff --git a/ckan/templates/admin/index.html b/ckan/templates/admin/index.html index e415d406fdb..ee007d66fcd 100644 --- a/ckan/templates/admin/index.html +++ b/ckan/templates/admin/index.html @@ -15,7 +15,7 @@

{{ _('What are sysadmins?') }}

- {% set docs_url = "http://docs.ckan.org/{0}/{1}/paster.html#sysadmin-give-sysadmin-rights".format(request.environ.CKAN_LANG, g.ckan_doc_version) %} + {% set docs_url = "http://docs.ckan.org/en/{0}/paster.html#sysadmin-give-sysadmin-rights".format(g.ckan_doc_version) %} {% trans %}

A sysadmin is someone that has full control over a CKAN instance. You can only add CKAN sysadmins via the sysadmin paster diff --git a/ckan/templates/footer.html b/ckan/templates/footer.html index fca1141eb46..7c6dc9a4d2b 100644 --- a/ckan/templates/footer.html +++ b/ckan/templates/footer.html @@ -10,7 +10,7 @@

    {% block footer_links_ckan %} - {% set api_url = 'http://docs.ckan.org/{0}/{1}/api.html'.format(request.environ.CKAN_LANG, g.ckan_doc_version) %} + {% set api_url = 'http://docs.ckan.org/en/{0}/api.html'.format(g.ckan_doc_version) %}
  • {{ _('CKAN API') }}
  • {{ _('Open Knowledge Foundation') }}
    • diff --git a/ckan/templates/group/about.html b/ckan/templates/group/about.html index ecacd804264..69259e22ec3 100644 --- a/ckan/templates/group/about.html +++ b/ckan/templates/group/about.html @@ -1,20 +1,18 @@ -{% extends "group/read.html" %} +{% extends "group/read_base.html" %} {% block subtitle %}{{ _('About') }} - {{ c.group_dict.display_name }}{% endblock %} {% block primary_content_inner %} -
    -

    {% block page_heading %}{{ c.group_dict.display_name }}{% endblock %}

    - {% block group_description %} - {% if c.group_dict.description %} - {{ h.render_markdown(c.group_dict.description) }} - {% else %} -

    {{ _('There is no description for this group') }}

    - {% endif %} - {% endblock %} +

    {% block page_heading %}{{ c.group_dict.display_name }}{% endblock %}

    + {% block group_description %} + {% if c.group_dict.description %} + {{ h.render_markdown(c.group_dict.description) }} + {% else %} +

    {{ _('There is no description for this group') }}

    + {% endif %} + {% endblock %} - {% block group_extras %} - {% snippet 'snippets/additional_info.html', extras = h.sorted_extras(c.group_dict.extras) %} - {% endblock %} -
    + {% block group_extras %} + {% snippet 'snippets/additional_info.html', extras = h.sorted_extras(c.group_dict.extras) %} + {% endblock %} {% endblock %} diff --git a/ckan/templates/group/activity_stream.html b/ckan/templates/group/activity_stream.html index dc84175cd7e..800ed24db9b 100644 --- a/ckan/templates/group/activity_stream.html +++ b/ckan/templates/group/activity_stream.html @@ -1,12 +1,10 @@ -{% extends "group/read.html" %} +{% extends "group/read_base.html" %} {% block subtitle %}{{ _('Activity Stream') }} - {{ c.group_dict.title or c.group_dict.name }}{% endblock %} {% block primary_content_inner %} -
    -

    {% block page_heading %}{{ _('Activity Stream') }}{% endblock %}

    - {% block activity_stream %} - {{ c.group_activity_stream | safe }} - {% endblock %} -
    +

    {% block page_heading %}{{ _('Activity Stream') }}{% endblock %}

    + {% block activity_stream %} + {{ c.group_activity_stream | safe }} + {% endblock %} {% endblock %} diff --git a/ckan/templates/group/admins.html b/ckan/templates/group/admins.html index e5049bc0cef..a682b3ea587 100644 --- a/ckan/templates/group/admins.html +++ b/ckan/templates/group/admins.html @@ -1,12 +1,10 @@ -{% extends "group/read.html" %} +{% extends "group/read_base.html" %} {% block subtitle %}{{ _('Administrators') }} - {{ c.group_dict.title or c.group_dict.name }}{% endblock %} {% block primary_content_inner %} -

    {% block page_heading %}{{ _('Administrators') }}{% endblock %}

    {% block admins_list %} {% snippet "user/snippets/followers.html", followers=c.admins %} {% endblock %} -
    {% endblock %} diff --git a/ckan/templates/group/base_form_page.html b/ckan/templates/group/base_form_page.html index a8936362a0d..25f817826c7 100644 --- a/ckan/templates/group/base_form_page.html +++ b/ckan/templates/group/base_form_page.html @@ -1,19 +1,15 @@ -{% extends "group/index.html" %} +{% extends "group/edit_base.html" %} -{% block add_action_content %}{% endblock %} +{% block page_primary_action %}{% endblock %} {% block breadcrumb_content %}
  • {{ h.nav_link(_('Groups'), controller='group', action='index') }}
  • {% block breadcrumb_link %}{{ h.nav_link(_('Add a Group'), controller='group', action='new') }}{% endblock %}
    • {% endblock %} -{% block primary_content %} -
    -
    -

    {% block page_heading %}{{ _('Group Form') }}{% endblock %}

    - {% block form %} - {{ c.form | safe }} - {% endblock %} -
    -
    +{% block primary_content_inner %} +

    {% block page_heading %}{{ _('Group Form') }}{% endblock %}

    + {% block form %} + {{ c.form | safe }} + {% endblock %} {% endblock %} diff --git a/ckan/templates/group/edit.html b/ckan/templates/group/edit.html index 90734091141..57808056d54 100644 --- a/ckan/templates/group/edit.html +++ b/ckan/templates/group/edit.html @@ -1,7 +1,14 @@ {% extends "group/base_form_page.html" %} -{% block subtitle %}{{ _('Edit a Group') }}{% endblock %} +{% block breadcrumb_content %} +
  • {% link_for _('Groups'), controller='group', action='index' %}
    • + {% block breadcrumb_content_inner %} +
  • {% link_for group.display_name|truncate(35), controller='group', action='read', id=group.name %}
    • +
  • {% link_for _('Edit'), controller='group', action='edit', id=group.name %}
    • + {% endblock %} +{% endblock %} -{% block breadcrumb_link %}{% link_for _('Edit Group'), controller='group', action='edit', id=c.group.name %}{% endblock %} +{% block subtitle %}{{ _('Edit Group') }}{% endblock %} -{% block page_heading %}{{ _('Edit a Group') }}{% endblock %} +{% block page_heading_class %}hide-heading{% endblock %} +{% block page_heading %}{{ _('Edit Group') }}{% endblock %} diff --git a/ckan/templates/group/edit_base.html b/ckan/templates/group/edit_base.html new file mode 100644 index 00000000000..a5f1203d529 --- /dev/null +++ b/ckan/templates/group/edit_base.html @@ -0,0 +1,24 @@ +{% extends "page.html" %} + +{% set group = c.group_dict %} + +{% block breadcrumb_content %} +
  • {% link_for _('Groups'), controller='group', action='index' %}
    • + {% block breadcrumb_content_inner %} +
  • {% link_for group.display_name|truncate(35), controller='group', action='read', id=group.name %}
    • +
  • {% link_for _('Edit'), controller='group', action='edit', id=group.name %}
    • + {% endblock %} +{% endblock %} + +{% block content_action %} + {% link_for _('View group'), controller='group', action='read', id=c.group_dict.name, class_='btn', icon='eye-open' %} +{% endblock %} + +{% block content_primary_nav %} + {{ h.build_nav_icon('group_edit', _('Edit'), id=c.group_dict.name) }} + {{ h.build_nav_icon('group_members', _('Members'), id=c.group_dict.name) }} +{% endblock %} + +{% block secondary_content %} + {% snippet "group/snippets/info.html", group=c.group_dict, show_nums=false %} +{% endblock %} diff --git a/ckan/templates/group/followers.html b/ckan/templates/group/followers.html index a4569cd2fc4..2f3aa14e1e0 100644 --- a/ckan/templates/group/followers.html +++ b/ckan/templates/group/followers.html @@ -1,12 +1,10 @@ -{% extends "group/read.html" %} +{% extends "group/read_base.html" %} {% block subtitle %}{{ _('Followers') }} - {{ c.group_dict.title or c.group_dict.name }}{% endblock %} {% block primary_content_inner %} -

    {% block page_heading %}{{ _('Followers') }}{% endblock %}

    {% block followers_list %} {% snippet "user/snippets/followers.html", followers=c.followers %} {% endblock %} -
    {% endblock %} diff --git a/ckan/templates/group/history.html b/ckan/templates/group/history.html index 9a0c5bdf053..5c2089bc0f0 100644 --- a/ckan/templates/group/history.html +++ b/ckan/templates/group/history.html @@ -3,10 +3,8 @@ {% block subtitle %}{{ _('History') }} - {{ c.group_dict.display_name }}{% endblock %} {% block primary_content_inner %} -

    {{ _('History') }}

    {% block group_history_revisions %} {% snippet "group/snippets/history_revisions.html", group_dict=c.group_dict, group_revisions=c.group_revisions %} {% endblock %} -
    {% endblock %} diff --git a/ckan/templates/group/index.html b/ckan/templates/group/index.html index 5c137aea788..8db2afb9c31 100644 --- a/ckan/templates/group/index.html +++ b/ckan/templates/group/index.html @@ -6,24 +6,19 @@
  • {% link_for _('Groups'), controller='group', action='index' %}
    • {% endblock %} -{% block add_action_content %} +{% block page_header %}{% endblock %} + +{% block page_primary_action %} {% if h.check_access('group_create') %} {% link_for _('Add Group'), controller='group', action='new', class_='btn btn-primary', icon='plus-sign-alt' %} {% endif %} {% endblock %} -{% block primary_content %} -
    -
    +{% block primary_content_inner %}

    {{ _('Groups') }}

    {% block groups_search_form %} - {% snippet 'snippets/simple_search.html', q=c.q, sort=c.sort_by_selected, placeholder=_('Search groups...') %} + {% snippet 'snippets/search_form.html', type='group', query=c.q, sorting_selected=c.sort_by_selected, count=c.page.item_count, placeholder=_('Search groups...'), show_empty=request.params %} {% endblock %} -

    - {% block groups_search_result_text %} - {% snippet 'snippets/search_result_text.html', query=c.q, count=c.page.item_count, type='group' %} - {% endblock %} -

    {% block groups_list %} {% if c.page.items or request.params %} {% snippet "group/snippets/group_list.html", groups=c.page.items %} @@ -36,27 +31,11 @@

    {% endif %} {% endblock %} -

    {% block page_pagination %} {{ c.page.pager() }} {% endblock %} -
    {% endblock %} {% block secondary_content %} -
    -

    - - {{ _('What are Groups?') }} -

    -
    - {% trans %} -

    Groups allow you to group together datasets under a community (for - example, Civil Liberty data) or topic (e.g. Transport, Health, - Environment) to make it easier for users to browse datasets by theme. - Datasets can be part of a group, but do not belong to the group for - editing or authorisation purposes.

    - {% endtrans %} -
    -
    + {% snippet "group/snippets/helper.html" %} {% endblock %} diff --git a/ckan/templates/group/member_new.html b/ckan/templates/group/member_new.html index e801b381b7f..87c6dbb60c2 100644 --- a/ckan/templates/group/member_new.html +++ b/ckan/templates/group/member_new.html @@ -1,48 +1,59 @@ -{% extends "page.html" %} -{% import 'macros/form.html' as form %} - -{% block subtitle %}{{ c.group_dict.display_name }}{% endblock %} +{% extends "group/edit_base.html" %} -{% block breadcrumb_content %} -
  • {% link_for _('Groups'), controller='group', action='index' %}
    • -
  • {% link_for c.group_dict.display_name|truncate(35), controller='group', action='read', id=c.group_dict.name %}
    • -{% endblock %} +{% import 'macros/form.html' as form %} -{% block actions_content %} - {% if h.check_access('organization_member_create', {'id': c.group_dict.id}) %} -
  • {% link_for _('Members'), controller='group', action='members', id=c.group_dict.id, class_='btn' %}
    • - {% endif %} -{% endblock %} +{% set user = c.user_dict %} -{% block primary_content %} -
    -
    -

    - {% block page_heading %}{{ _('Edit Member') if c.user_name else _('Add Member') }}{% endblock %} -

    - {% block form %} -
    - {% if c.user_name %} - - {% else %} - {% set format_attrs = {'data-module': 'autocomplete', 'data-module-source': '/api/2/util/user/autocomplete?q=?'} %} - {{ form.input('username', id='field-username', label=_('User'), placeholder=_('Username'), value='', error='', classes=['control-medium'], attrs=format_attrs) }} - {% endif %} - {% set format_attrs = {'data-module': 'autocomplete'} %} - {{ form.select('role', label=_('Role'), options=c.roles, selected='', error='', attrs=format_attrs) }} - -
    - {% endblock %} +{% block primary_content_inner %} + {% link_for _('Back to all members'), controller='group', action='members', id=group.name, class_='btn pull-right', icon='arrow-left' %} +

    + {% block page_heading %}{{ _('Edit Member') if user else _('Add Member') }}{% endblock %} +

    + {% block form %} +
    + {% if user %} + + {% set format_attrs = {'disabled': true} %} + {{ form.input('username', label=_('User'), value=user.name, classes=['control-medium'], attrs=format_attrs) }} + {% else %} + {% set format_attrs = {'data-module': 'autocomplete', 'data-module-source': '/api/2/util/user/autocomplete?q=?'} %} + {{ form.input('username', id='field-username', label=_('User'), placeholder=_('Username'), value='', error='', classes=['control-medium'], attrs=format_attrs) }} + {% endif %} + {% set format_attrs = {'data-module': 'autocomplete'} %} + {{ form.select('role', label=_('Role'), options=c.roles, selected=c.user_role, error='', attrs=format_attrs) }} +
    + {% if user %} + {% set locale = h.dump_json({'content': _('Are you sure you want to delete this member?')}) %} + {{ _('Delete') }} + + {% else %} + + {% endif %}
    -
    + + {% endblock %} {% endblock %} {% block secondary_content %} - {% snippet 'snippets/group.html', group=c.group_dict %} - -{% endblock %} - -{% block links %} {{ super() }} - {% include "group/snippets/feeds.html" %} +
    +

    + + {{ _('What are roles?') }} +

    +
    + {% trans %} +

    Admin: Can add/edit and delete datasets, as well as + manage group members.

    +

    Editor: Can add and edit datasets, but not manage + group members.

    +

    Member: Can view the group's private + datasets, but not add new datasets.

    + {% endtrans %} +
    +
    {% endblock %} diff --git a/ckan/templates/group/members.html b/ckan/templates/group/members.html index 1f00648f140..600c6d1bf54 100644 --- a/ckan/templates/group/members.html +++ b/ckan/templates/group/members.html @@ -1,44 +1,39 @@ -{% extends "page.html" %} +{% extends "group/edit_base.html" %} -{% block subtitle %}{{ c.group_dict.display_name }}{% endblock %} +{% block subtitle %}{{ _('Members') }} - {{ c.group_dict.display_name }}{% endblock %} -{% block breadcrumb_content %} -
  • {% link_for _('Groups'), controller='group', action='index' %}
    • -
  • {% link_for c.group_dict.display_name|truncate(35), controller='group', action='read', id=c.group_dict.name %}
    • -{% endblock %} - -{% block actions_content %} - {% if h.check_access('organization_member_create', {'id': c.group_dict.id}) %} -
  • {% link_for _('Add Member'), controller='group', action='member_new', id=c.group_dict.id, class_='btn', icon='plus' %}
    • - {% endif %} -{% endblock %} - -{% block primary_content %} -
    -
    -

    {% block page_heading %}{{ _('Members') }}{% endblock %}

    - {% block members_list %} - - {% for user_id, user, role in c.members %} - - - - +{% block primary_content_inner %} + {% link_for _('Add Member'), controller='group', action='member_new', id=c.group_dict.id, class_='btn pull-right', icon='plus-sign-alt' %} +

    {{ _('{0} members'.format(c.members|length)) }}

    +
    {{ h.linked_user(user_id, maxlength=20) }}{{ role }}{% link_for _('Edit'), controller='group', action='member_new', id=c.group_dict.id, class_='btn', user=user_id %}
    + + + + + + + + + + + + {% for user_id, user, role in c.members %} + + + + - - {% endfor %} -
    {{ _('User') }}{{ _('Role') }}
    + {{ h.linked_user(user_id, maxlength=20) }} + {{ role }} {% set locale = h.dump_json({'content': _('Are you sure you want to delete this member?')}) %} - {% block delete_button_text %}{{ _('Delete') }}{% endblock %}
    - {% endblock %} -
    -
    -{% endblock %} - -{% block secondary_content %} - {% snippet 'snippets/group.html', group=c.group_dict %} -{% endblock %} - -{% block links %} - {{ super() }} - {% include "group/snippets/feeds.html" %} +
    + + + + {% block delete_button_text %}{% endblock %} +
    + + + {% endfor %} + + {% endblock %} diff --git a/ckan/templates/group/new.html b/ckan/templates/group/new.html index 276ba723c30..91179be106c 100644 --- a/ckan/templates/group/new.html +++ b/ckan/templates/group/new.html @@ -6,4 +6,9 @@ {% block page_heading %}{{ _('Create a Group') }}{% endblock %} -{% block actions_content %}{% endblock %} +{% block page_header %}{% endblock %} + +{% block secondary_content %} + {% snippet "group/snippets/helper.html" %} +{% endblock %} + diff --git a/ckan/templates/group/read.html b/ckan/templates/group/read.html index f56359b37d9..6d50fd0d905 100644 --- a/ckan/templates/group/read.html +++ b/ckan/templates/group/read.html @@ -2,20 +2,34 @@ {% block subtitle %}{{ c.group_dict.display_name }}{% endblock %} +{% block page_primary_action %} + {% link_for _('Add Dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %} +{% endblock %} + {% block primary_content_inner %} -
    - {% block packages_list %} - {% include "package/snippets/search_form.html" %} - {% endblock %} -
    + {% block groups_search_form %} + {% set facets = { + 'fields': c.fields_grouped, + 'search': c.search_facets, + 'titles': c.facet_titles, + 'translated_fields': c.translated_fields, + 'remove_field': c.remove_field } + %} + {% snippet 'snippets/search_form.html', type='dataset', query=c.q, sorting_selected=c.sort_by_selected, count=c.page.item_count, facets=facets, placeholder=_('Search datasets...'), show_empty=request.params %} + {% endblock %} + {% block packages_list %} + {% if c.page.items %} + {{ h.snippet('snippets/package_list.html', packages=c.page.items) }} + {% endif %} + {% endblock %} {% block page_pagination %} - {{ c.page.pager(q=c.q) }} + {{ c.page.pager(q=c.q) }} {% endblock %} {% endblock %} {% block secondary_content %} {{ super() }} {% for facet in c.facet_titles %} - {{ h.snippet('snippets/facet_list.html', title=c.facet_titles[facet], name=facet, extras={'id':c.group_dict.id}) }} + {{ h.snippet('snippets/facet_list.html', title=c.facet_titles[facet], name=facet, extras={'id':c.group_dict.id}) }} {% endfor %} {% endblock %} diff --git a/ckan/templates/group/read_base.html b/ckan/templates/group/read_base.html index 949c43478f6..afa92f2038f 100644 --- a/ckan/templates/group/read_base.html +++ b/ckan/templates/group/read_base.html @@ -7,60 +7,20 @@
  • {% link_for c.group_dict.display_name|truncate(35), controller='group', action='read', id=c.group_dict.name %}
    • {% endblock %} -{% block actions_content %} +{% block content_action %} {% if h.check_access('group_update', {'id': c.group_dict.id}) %} -
  • {% link_for _('Add Dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn', icon='plus-sign-alt' %}
    • -
  • {% link_for _('Edit'), controller='group', action='edit', id=c.group_dict.name, class_='btn btn-primary', icon='wrench' %}
    • + {% link_for _('Edit'), controller='group', action='edit', id=c.group_dict.name, class_='btn', icon='wrench' %} {% endif %} -
  • {{ h.follow_button('group', c.group_dict.id) }}
    • {% endblock %} -{% block primary_content %} -
    - {% block page_header %} -
    -
      - {% block page_header_tabs %} - {{ h.build_nav_icon('group_read', _('Datasets'), id=c.group_dict.name) }} - {{ h.build_nav_icon('group_activity', _('Activity Stream'), id=c.group_dict.name, offset=0) }} - {{ h.build_nav_icon('group_about', _('About'), id=c.group_dict.name) }} - {% endblock %} -
    -
    - {% endblock %} - {% block primary_content_inner %}{% endblock %} -
    +{% block content_primary_nav %} + {{ h.build_nav_icon('group_read', _('Datasets'), id=c.group_dict.name) }} + {{ h.build_nav_icon('group_activity', _('Activity Stream'), id=c.group_dict.name, offset=0) }} + {{ h.build_nav_icon('group_about', _('About'), id=c.group_dict.name) }} {% endblock %} {% block secondary_content %} -
    -
    -
    - - {{ c.group_dict.name }} - -
    -

    {{ c.group_dict.display_name }}

    - {% if c.group_dict.description %} -

    - {{ h.markdown_extract(c.group_dict.description, 180) }} - {% link_for _('read more'), controller='group', action='about', id=c.group_dict.name %} -

    - {% else %} -

    {{ _('There is no description for this group') }}

    - {% endif %} -
    -
    -
    {{ _('Followers') }}
    -
    {{ h.SI_number_span(c.group_dict.num_followers) }}
    -
    -
    -
    {{ _('Datasets') }}
    -
    {{ h.SI_number_span(c.group_dict.packages|length) }}
    -
    -
    -
    -
    + {% snippet "group/snippets/info.html", group=c.group_dict, show_nums=true %} {% endblock %} {% block links %} diff --git a/ckan/templates/group/snippets/helper.html b/ckan/templates/group/snippets/helper.html new file mode 100644 index 00000000000..a73c9d6dde7 --- /dev/null +++ b/ckan/templates/group/snippets/helper.html @@ -0,0 +1,15 @@ +
    +

    + + {{ _('What are Groups?') }} +

    +
    + {% trans %} +

    Groups allow you to group together datasets under a community (for + example, Civil Liberty data) or topic (e.g. Transport, Health, + Environment) to make it easier for users to browse datasets by theme. + Datasets can be part of a group, but do not belong to the group for + editing or authorisation purposes.

    + {% endtrans %} +
    +
    \ No newline at end of file diff --git a/ckan/templates/group/snippets/info.html b/ckan/templates/group/snippets/info.html new file mode 100644 index 00000000000..b7c749ab147 --- /dev/null +++ b/ckan/templates/group/snippets/info.html @@ -0,0 +1,33 @@ +
    +
    +
    + + {{ group.name }} + +
    +

    {{ group.display_name }}

    + {% if group.description %} +

    + {{ h.markdown_extract(group.description, 180) }} + {% link_for _('read more'), controller='group', action='about', id=group.name %} +

    + {% else %} +

    {{ _('There is no description for this group') }}

    + {% endif %} + {% if show_nums %} +
    +
    +
    {{ _('Followers') }}
    +
    {{ h.SI_number_span(group.num_followers) }}
    +
    +
    +
    {{ _('Datasets') }}
    +
    {{ h.SI_number_span(group.packages|length) }}
    +
    +
    + + {% endif %} +
    +
    \ No newline at end of file diff --git a/ckan/templates/header.html b/ckan/templates/header.html index f684965c7ce..4b0c32fdbc1 100644 --- a/ckan/templates/header.html +++ b/ckan/templates/header.html @@ -19,11 +19,12 @@ {{ c.userobj.display_name }} -
  • - {% set notifications_tooltip = ngettext('Dashboard (%(num)d new item)', 'Dashboard (%(num)d new items)', c.new_activities) %} + {% set new_activities = h.new_activities() %} +
  • + {% set notifications_tooltip = ngettext('Dashboard (%(num)d new item)', 'Dashboard (%(num)d new items)', new_activities) %} - {{ c.new_activities }} + {{ new_activities }}
    • {% block header_account_settings_link %} diff --git a/ckan/templates/home/index.html b/ckan/templates/home/index.html index 58a8d33f760..0e97fc322c7 100644 --- a/ckan/templates/home/index.html +++ b/ckan/templates/home/index.html @@ -57,12 +57,15 @@

    {% block home_image_caption %}{{ _("This is a featured {% block home_secondary_content %}
    {% block home_search %} -
    +

    {{ _("Search Your Data") }}

    - +
    - - + +
    {% endblock %} {% block home_tags %} diff --git a/ckan/templates/organization/about.html b/ckan/templates/organization/about.html index 22054f45d0d..47b56d5ebdd 100644 --- a/ckan/templates/organization/about.html +++ b/ckan/templates/organization/about.html @@ -3,7 +3,6 @@ {% block subtitle %}{{ _('About') }} - {{ c.group_dict.display_name }}{% endblock %} {% block primary_content_inner %} -

    {% block page_heading %}{{ c.group_dict.display_name }}{% endblock %}

    {% block organization_description %} {% if c.group_dict.description %} @@ -16,5 +15,4 @@

    {% block page_heading %}{{ c.group_dict.display_name }}{% endblock %}

    {% block organization_extras %} {% snippet 'snippets/additional_info.html', extras = h.sorted_extras(c.group_dict.extras) %} {% endblock %} -
    {% endblock %} diff --git a/ckan/templates/organization/activity_stream.html b/ckan/templates/organization/activity_stream.html index 30fc375d697..0320bb76c16 100644 --- a/ckan/templates/organization/activity_stream.html +++ b/ckan/templates/organization/activity_stream.html @@ -3,10 +3,8 @@ {% block subtitle %}{{ _('Activity Stream') }} - {{ c.group_dict.title or c.group_dict.name }}{% endblock %} {% block primary_content_inner %} -

    {% block page_heading %}{{ _('Activity Stream') }}{% endblock %}

    {% block activity_stream %} {{ c.group_activity_stream | safe }} {% endblock %} -
    {% endblock %} diff --git a/ckan/templates/organization/admins.html b/ckan/templates/organization/admins.html index aeb455c2ab7..fa9a1cdbeeb 100644 --- a/ckan/templates/organization/admins.html +++ b/ckan/templates/organization/admins.html @@ -3,10 +3,8 @@ {% block subtitle %}{{ _('Administrators') }} - {{ c.group_dict.title or c.group_dict.name }}{% endblock %} {% block primary_content_inner %} -

    {% block page_heading %}{{ _('Administrators') }}{% endblock %}

    {% block admins_list %} {% snippet "user/snippets/followers.html", followers=c.admins %} {% endblock %} -
    {% endblock %} diff --git a/ckan/templates/organization/base_form_page.html b/ckan/templates/organization/base_form_page.html index 1bff311bc99..4eb308287e1 100644 --- a/ckan/templates/organization/base_form_page.html +++ b/ckan/templates/organization/base_form_page.html @@ -1,12 +1,10 @@ {% extends "organization/edit_base.html" %} {% block primary_content_inner %} -

    {% block page_heading %}{{ _('Organization Form') }}{% endblock %}

    {% block form %} {{ c.form | safe }} {% endblock %} -
    {% endblock %} diff --git a/ckan/templates/organization/bulk_process.html b/ckan/templates/organization/bulk_process.html index df45b0ebf35..f06809fcd07 100644 --- a/ckan/templates/organization/bulk_process.html +++ b/ckan/templates/organization/bulk_process.html @@ -2,11 +2,14 @@ {% block subtitle %}{{ _('Edit datasets') }} - {{ super() }}{% endblock %} +{% block page_primary_action %} + {% link_for _('Add dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %} +{% endblock %} + {% block primary_content_inner %}

    {{ _('Edit datasets') }}

    - {% link_for _('Add Dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn pull-right', icon='plus-sign-alt' %}

    {% block page_heading %} {%- if c.page.item_count -%} @@ -90,7 +93,17 @@

    {% endblock %} {% block secondary_content %} - {{ super() }} -
    -

    - - {{ _('What are roles?') }} -

    -
    - {% trans %} -

    Admin: Can add/edit and delete datasets, as well as - manage organization members.

    -

    Editor: Can add and edit datasets, but not manage - organization members.

    -

    Member: Can view the organization's private - datasets, but not add new datasets.

    - {% endtrans %} -
    +{{ super() }} +
    +

    + + {{ _('What are roles?') }} +

    +
    + {% trans %} +

    Admin: Can add/edit and delete datasets, as well as + manage organization members.

    +

    Editor: Can add and edit datasets, but not manage + organization members.

    +

    Member: Can view the organization's private + datasets, but not add new datasets.

    + {% endtrans %}
    {% endblock %} diff --git a/ckan/templates/organization/members.html b/ckan/templates/organization/members.html index 7bb5b648349..875263feaa3 100644 --- a/ckan/templates/organization/members.html +++ b/ckan/templates/organization/members.html @@ -2,40 +2,41 @@ {% block subtitle %}{{ _('Members') }} - {{ c.group_dict.display_name }}{% endblock %} +{% block page_primary_action %} + {% link_for _('Add Member'), controller='organization', action='member_new', id=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %} +{% endblock %} + {% block primary_content_inner %} -
    - {% link_for _('Add Member'), controller='organization', action='member_new', id=c.group_dict.id, class_='btn pull-right', icon='plus-sign-alt' %} -

    {{ _('{0} members'.format(c.members|length)) }}

    - - - - - - - - - - - - - {% for user_id, user, role in c.members %} - - - - - - {% endfor %} - -
    {{ _('User') }}{{ _('Role') }}
    - {{ h.linked_user(user_id, maxlength=20) }} - {{ role }} - {% set locale = h.dump_json({'content': _('Are you sure you want to delete this member?')}) %} -
    - - - - {% block delete_button_text %}{% endblock %} -
    -
    -
    +

    {{ _('{0} members'.format(c.members|length)) }}

    + + + + + + + + + + + + + {% for user_id, user, role in c.members %} + + + + + + {% endfor %} + +
    {{ _('User') }}{{ _('Role') }}
    + {{ h.linked_user(user_id, maxlength=20) }} + {{ role }} + {% set locale = h.dump_json({'content': _('Are you sure you want to delete this member?')}) %} +
    + + + + {% block delete_button_text %}{% endblock %} +
    +
    {% endblock %} diff --git a/ckan/templates/organization/new.html b/ckan/templates/organization/new.html index b490fd36a01..7af6a1d08db 100644 --- a/ckan/templates/organization/new.html +++ b/ckan/templates/organization/new.html @@ -10,4 +10,8 @@ {% block breadcrumb_content_inner %}
  • {{ _('Create an Organization') }}
    • -{% endblock %} \ No newline at end of file +{% endblock %} + +{% block secondary_content %} + {% snippet "organization/snippets/helper.html" %} +{% endblock %} diff --git a/ckan/templates/organization/read.html b/ckan/templates/organization/read.html index 02e2e5e1596..aae8f995b20 100644 --- a/ckan/templates/organization/read.html +++ b/ckan/templates/organization/read.html @@ -1,13 +1,29 @@ {% extends "organization/read_base.html" %} +{% block page_primary_action %} + {% if h.check_access('package_create', {'organization_id': c.group_dict.id}) %} + {% link_for _('Add Dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %} + {% endif %} +{% endblock %} + {% block primary_content_inner %} -
    - {% block packages_list %} - {% include "package/snippets/search_form.html" %} + {% block groups_search_form %} + {% set facets = { + 'fields': c.fields_grouped, + 'search': c.search_facets, + 'titles': c.facet_titles, + 'translated_fields': c.translated_fields, + 'remove_field': c.remove_field } + %} + {% snippet 'snippets/search_form.html', type='dataset', query=c.q, sorting_selected=c.sort_by_selected, count=c.page.item_count, facets=facets, placeholder=_('Search datasets...'), show_empty=request.params %} {% endblock %} -
    + {% block packages_list %} + {% if c.page.items %} + {{ h.snippet('snippets/package_list.html', packages=c.page.items) }} + {% endif %} + {% endblock %} {% block page_pagination %} - {{ c.page.pager(q=c.q) }} + {{ c.page.pager(q=c.q) }} {% endblock %} {% endblock %} diff --git a/ckan/templates/organization/read_base.html b/ckan/templates/organization/read_base.html index 959d078d7e2..a9ff1bf6302 100644 --- a/ckan/templates/organization/read_base.html +++ b/ckan/templates/organization/read_base.html @@ -7,30 +7,16 @@
  • {% link_for c.group_dict.display_name|truncate(35), controller='organization', action='read', id=c.group_dict.name %}
    • {% endblock %} -{% block actions_content %} +{% block content_action %} {% if h.check_access('organization_update', {'id': c.group_dict.id}) %} -
  • {% link_for _('Add Dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn', icon='plus-sign-alt' %}
    • -
  • {% link_for _('Admin'), controller='organization', action='edit', id=c.group_dict.name, class_='btn btn-primary', icon='wrench' %}
    • + {% link_for _('Admin'), controller='organization', action='edit', id=c.group_dict.name, class_='btn', icon='wrench' %} {% endif %} -
  • {{ h.follow_button('group', c.group_dict.id) }}
    • - {#
  • {% link_for _('History'), controller='organization', action='history', id=c.group_dict.name, class_='btn', icon='undo' %}
    • #} {% endblock %} -{% block primary_content %} -
    - {% block page_header %} -
    -
      - {% block page_header_tabs %} - {{ h.build_nav_icon('organization_read', _('Datasets'), id=c.group_dict.name) }} - {{ h.build_nav_icon('organization_activity', _('Activity Stream'), id=c.group_dict.name) }} - {{ h.build_nav_icon('organization_about', _('About'), id=c.group_dict.name) }} - {% endblock %} -
    -
    - {% endblock %} - {% block primary_content_inner %}{% endblock %} -
    +{% block content_primary_nav %} + {{ h.build_nav_icon('organization_read', _('Datasets'), id=c.group_dict.name) }} + {{ h.build_nav_icon('organization_activity', _('Activity Stream'), id=c.group_dict.name) }} + {{ h.build_nav_icon('organization_about', _('About'), id=c.group_dict.name) }} {% endblock %} {% block secondary_content %} diff --git a/ckan/templates/organization/snippets/helper.html b/ckan/templates/organization/snippets/helper.html new file mode 100644 index 00000000000..f0acbd46d73 --- /dev/null +++ b/ckan/templates/organization/snippets/helper.html @@ -0,0 +1,17 @@ +
    +

    + + {{ _('What are Organizations?') }} +

    +
    + {% trans %} +

    Organizations act like publishing departments for datasets (for + example, the Department of Health). This means that datasets can be + published by and belong to a department instead of an individual + user.

    +

    Within organizations, admins can assign roles and authorisation its + members, giving individual users the right to publish datasets from + that particular organisation (e.g. Office of National Statistics).

    + {% endtrans %} +
    +
    \ No newline at end of file diff --git a/ckan/templates/package/activity.html b/ckan/templates/package/activity.html index 603fc6a8565..14600d5211a 100644 --- a/ckan/templates/package/activity.html +++ b/ckan/templates/package/activity.html @@ -3,10 +3,8 @@ {% block subtitle %}{{ _('Activity Stream') }} - {{ c.pkg_dict.title or c.pkg_dict.name }}{% endblock %} {% block primary_content_inner %} -

    {% block page_heading %}{{ _('Activity Stream') }}{% endblock %}

    {% block activity_stream %} {{ c.package_activity_stream | safe }} {% endblock %} -
    {% endblock %} diff --git a/ckan/templates/package/activity_stream.html b/ckan/templates/package/activity_stream.html index dd1d2a5268e..233c3b58c43 100644 --- a/ckan/templates/package/activity_stream.html +++ b/ckan/templates/package/activity_stream.html @@ -3,10 +3,8 @@ {% block subtitle %}{{ _('Activity Stream') }}{% endblock %} {% block package_content %} -

    {% block page_heading %}{{ _('Activity Stream') }}{% endblock %}

    {% block activity_stream %} {{ c.package_activity_stream | safe }} {% endblock %} -
    {% endblock %} diff --git a/ckan/templates/package/base.html b/ckan/templates/package/base.html index 890c97531ae..da2d278e9f4 100644 --- a/ckan/templates/package/base.html +++ b/ckan/templates/package/base.html @@ -10,7 +10,7 @@ {% if pkg.organization %} {% set organization = pkg.organization.title or pkg.organization.name %}
  • {% link_for _('Organizations'), controller='organization', action='index' %}
    • -
  • {% link_for organization|truncate(30), controller='organization', action='read', id=pkg.organization.name %} +
  • {% link_for organization|truncate(30), controller='organization', action='read', id=pkg.organization.name %}
    • {% else %}
  • {% link_for _('Datasets'), controller='package', action='search' %}
    • {% endif %} diff --git a/ckan/templates/package/edit.html b/ckan/templates/package/edit.html index 668a00cc3e3..4f15985d033 100644 --- a/ckan/templates/package/edit.html +++ b/ckan/templates/package/edit.html @@ -13,8 +13,8 @@ {% snippet 'package/snippets/resources.html', pkg=pkg, action='resource_edit' %} {% endblock %} -{% block actions_content %} -
  • {% link_for _('View dataset'), controller='package', action='read', id=pkg.name, class_='btn', icon='eye-open' %}
    • +{% block content_action %} + {% link_for _('View dataset'), controller='package', action='read', id=pkg.name, class_='btn', icon='eye-open' %} {% endblock %} {% block secondary_content %} diff --git a/ckan/templates/package/followers.html b/ckan/templates/package/followers.html index 91a650c49fc..04211893fde 100644 --- a/ckan/templates/package/followers.html +++ b/ckan/templates/package/followers.html @@ -3,10 +3,8 @@ {% block subtitle %}{{ _('Followers') }} - {{ c.pkg_dict.title or c.pkg_dict.name }}{% endblock %} {% block primary_content_inner %} -

    {% block page_heading %}{{ _('Followers') }}{% endblock %}

    {% block followers_list %} {% snippet "user/snippets/followers.html", followers=c.followers %} {% endblock %} -
    {% endblock %} diff --git a/ckan/templates/package/history.html b/ckan/templates/package/history.html index 0f09674214a..f4e3516cc96 100644 --- a/ckan/templates/package/history.html +++ b/ckan/templates/package/history.html @@ -3,10 +3,8 @@ {% block subtitle %}{{ _('History') }} - {{ c.pkg_dict.title or c.pkg_dict.name }}{% endblock %} {% block primary_content_inner %} -

    {{ _('History') }}

    {% block package_history_revisions %} {% snippet "package/snippets/history_revisions.html", pkg_dict=pkg, pkg_revisions=c.pkg_revisions %} {% endblock %} -
    {% endblock %} diff --git a/ckan/templates/package/read.html b/ckan/templates/package/read.html index 46405de1249..a805b4a5763 100644 --- a/ckan/templates/package/read.html +++ b/ckan/templates/package/read.html @@ -5,33 +5,31 @@ {% block subtitle %}{{ pkg.title or pkg.name }}{% endblock %} {% block primary_content_inner %} - + {{ super() }} {% block package_description %} -
    - {% if pkg.private %} - - - {{ _('Private') }} - - {% endif %} -

    - {% block page_heading %} - {{ pkg.title or pkg.name }} - {% if pkg.state.startswith('draft') %} - [{{ _('Draft') }}] - {% endif %} - {% endblock %} -

    - {% block package_notes %} - {% if c.pkg_notes_formatted %} -
    - {{ c.pkg_notes_formatted }} -
    + {% if pkg.private %} + + + {{ _('Private') }} + + {% endif %} +

    + {% block page_heading %} + {{ pkg.title or pkg.name }} + {% if pkg.state.startswith('draft') %} + [{{ _('Draft') }}] {% endif %} {% endblock %} - {# FIXME why is this here? seems wrong #} - -

    +

    + {% block package_notes %} + {% if c.pkg_notes_formatted %} +
    + {{ c.pkg_notes_formatted }} +
    + {% endif %} + {% endblock %} + {# FIXME why is this here? seems wrong #} + {% endblock %} {% block package_resources %} diff --git a/ckan/templates/package/read_base.html b/ckan/templates/package/read_base.html index ece96487471..daecd18bf75 100644 --- a/ckan/templates/package/read_base.html +++ b/ckan/templates/package/read_base.html @@ -14,29 +14,19 @@ {% endblock -%} -{% block actions_content %} - {# NOTE: Not implemented in stage 1 #} - {#
  • {% link_for _('History'), controller='package', action='history', id=pkg.name, class_='btn', icon='undo' %}
    • #} +{% block content_action %} {% if h.check_access('package_update', {'id':pkg.id }) %} -
  • {% link_for _('Edit'), controller='package', action='edit', id=pkg.name, class_='btn btn-primary', icon='wrench' %}
    • + {% link_for _('Edit'), controller='package', action='edit', id=pkg.name, class_='btn', icon='wrench' %} {% endif %} -
  • {{ h.follow_button('dataset', pkg.id) }}
    • {% endblock %} -{% block primary_content %} -
    - {% block page_header %} -
    -
      - {% block page_header_tabs %} - {{ h.build_nav_icon('dataset_read', _('Dataset'), id=pkg.name) }} - {{ h.build_nav_icon('dataset_activity', _('Activity Stream'), id=pkg.name) }} - {{ h.build_nav_icon('related_list', _('Related'), id=pkg.name) }} - {% endblock %} -
    -
    - {% endblock %} +{% block content_primary_nav %} + {{ h.build_nav_icon('dataset_read', _('Dataset'), id=pkg.name) }} + {{ h.build_nav_icon('dataset_activity', _('Activity Stream'), id=pkg.name) }} + {{ h.build_nav_icon('related_list', _('Related'), id=pkg.name) }} +{% endblock %} +{% block primary_content_inner %} {% block package_revision_info %} {% if c.pkg_revision_id %}
    @@ -53,18 +43,32 @@
    {% endif %} {% endblock %} - - {% block primary_content_inner %}{% endblock %} -
    {% endblock %} {% block secondary_content %} {% block secondary_help_content %}{% endblock %} + {% block package_info %} +
    +
    +

    {{ pkg.title or pkg.name }}

    +
    +
    +
    {{ _('Followers') }}
    +
    {{ h.SI_number_span(h.get_action('dataset_follower_count', {'id': pkg.id})) }}
    +
    +
    + +
    +
    + {% endblock %} + {% block package_organization %} {% if pkg.organization %} - {% snippet "snippets/organization.html", organization=pkg.organization %} + {% snippet "snippets/organization.html", organization=pkg.organization, has_context_title=true %} {% endif %} {% endblock %} diff --git a/ckan/templates/package/related_list.html b/ckan/templates/package/related_list.html index 1b7dfd5b806..d9aa5ac34f9 100644 --- a/ckan/templates/package/related_list.html +++ b/ckan/templates/package/related_list.html @@ -3,7 +3,6 @@ {% set pkg = c.pkg %} {% block primary_content_inner %} -

    {% block page_heading %}{{ _('Related Media for {dataset}').format(dataset=h.dataset_display_name(c.pkg)) }}{% endblock %}

    {% block related_list %} {% if c.pkg.related %} @@ -17,5 +16,4 @@

    {% block page_heading %}{{ _('Related Media for {datase {% link_for _('Add Related Item'), controller='related', action='new', id=pkg.name, class_='btn btn-primary' %}

{% endblock %} - {% endblock %} diff --git a/ckan/templates/package/resource_edit.html b/ckan/templates/package/resource_edit.html index fdc6f9001f5..52ac2ab4722 100644 --- a/ckan/templates/package/resource_edit.html +++ b/ckan/templates/package/resource_edit.html @@ -12,8 +12,8 @@
  • {{ _('Edit') }}
    • {% endblock %} -{% block actions_content %} -
  • {% link_for _('View resource'), controller='package', action='resource_read', id=pkg_dict.name, resource_id=res.id, class_='btn', icon='eye-open' %}
    • +{% block content_action %} + {% link_for _('View resource'), controller='package', action='resource_read', id=pkg_dict.name, resource_id=res.id, class_='btn', icon='eye-open' %} {% endblock %} {# logged_in is defined in new_resource.html #} diff --git a/ckan/templates/package/resource_read.html b/ckan/templates/package/resource_read.html index 441745bfdac..46406746a6f 100644 --- a/ckan/templates/package/resource_read.html +++ b/ckan/templates/package/resource_read.html @@ -36,6 +36,8 @@ {{ _('View') }} {% elif res.resource_type == 'api' %} {{ _('API Endpoint') }} + {% elif not res.can_be_previewed %} + {{ _('Go to resource') }} {% else %} {{ _('Download') }} {% endif %} @@ -71,7 +73,7 @@

    {{ _('From the dataset abstract') }}

    {% block data_preview %} - {{ h.resource_preview(c.resource, c.package.id) }} + {{ h.resource_preview(c.resource, c.package) }} {% endblock %} {% endblock %} diff --git a/ckan/templates/package/search.html b/ckan/templates/package/search.html index 09c5d24c9e3..7bf773bd82e 100644 --- a/ckan/templates/package/search.html +++ b/ckan/templates/package/search.html @@ -3,12 +3,6 @@ {% block subtitle %}{{ _("Search for a Dataset") }}{% endblock %} -{% block add_action_content %} - {% if h.check_access('package_create') %} - {% link_for _('Add Dataset'), controller='package', action='new', class_='btn btn-primary', icon='plus-sign-alt' %} - {% endif %} -{% endblock %} - {% block breadcrumb_content %}
  • {{ h.nav_link(_('Datasets'), controller='package', action='search', highlight_actions = 'new index') }}
    • {% endblock %} @@ -16,71 +10,33 @@ {% block primary_content %}
    + {% block page_primary_action %} + {% if h.check_access('package_create') %} +
    + {% link_for _('Add Dataset'), controller='package', action='new', class_='btn btn-primary', icon='plus-sign-alt' %} +
    + {% endif %} + {% endblock %} {% block form %} - + {% set facets = { + 'fields': c.fields_grouped, + 'search': c.search_facets, + 'titles': c.facet_titles, + 'translated_fields': c.translated_fields, + 'remove_field': c.remove_field } + %} + {% set sorting = [ + (_('Relevance'), 'score desc, metadata_modified desc'), + (_('Name Ascending'), 'title_string asc'), + (_('Name Descending'), 'title_string desc'), + (_('Last Modified'), 'metadata_modified desc'), + (_('Popular'), 'views_recent desc') if g.tracking_enabled else (false, false) ] + %} + {% snippet 'snippets/search_form.html', type='dataset', query=c.q, sorting=sorting, sorting_selected=c.sort_by_selected, count=c.page.item_count, facets=facets, show_empty=request.params, error=c.query_error %} {% endblock %} - {% block package_search_results %} -
    - - {% block package_search_results_text %} - {% snippet 'snippets/search_result_text.html', query=c.q, count=c.page.item_count, type='dataset' %} - {% endblock %} - -
    - {% block package_search_results_filter_list %} - {% for field in c.fields_grouped %} - {% set search_facets_items = c.search_facets.get(field)['items'] %} - {{ c.facet_titles.get(field) }}: - {% for value in c.fields_grouped[field] %} - - {%- if c.translated_fields and c.translated_fields.has_key((field,value)) -%} - {{ c.translated_fields[(field,value)] }} - {%- else -%} - {{ h.list_dict_filter(search_facets_items , 'name', 'display_name', value) }} - {%- endif %} - - - {% endfor %} - {% endfor %} - {% endblock %} -
    - {% if request.params and c.page.item_count == 0 %} - {% trans %} -

    Please try another search.

    - {% endtrans %} - {% endif %} -
    - - {% if c.query_error %} - {% trans %} -

    There was an error while searching. Please try again.

    - {% endtrans %} - {% endif %} {% block package_search_results_list %} {{ h.snippet('snippets/package_list.html', packages=c.page.items) }} {% endblock %} - {% endblock %}
    {% block page_pagination %} @@ -93,7 +49,7 @@
    {% set api_link = h.link_to(_('API'), h.url_for(controller='api', action='get_api', ver=3)) %} - {% set api_doc_link = h.link_to(_('API Docs'), 'http://docs.ckan.org/{0}/{1}/api.html'.format(request.environ.CKAN_LANG, g.ckan_doc_version)) %} + {% set api_doc_link = h.link_to(_('API Docs'), 'http://docs.ckan.org/en/{0}/api.html'.format(g.ckan_doc_version)) %} {% if g.dumps_url -%} {% set dump_link = h.link_to(_('full {format} dump').format(format=g.dumps_format), g.dumps_url) %} {% trans %} diff --git a/ckan/templates/package/snippets/additional_info.html b/ckan/templates/package/snippets/additional_info.html index f5e864c7674..2fa73a36ec2 100644 --- a/ckan/templates/package/snippets/additional_info.html +++ b/ckan/templates/package/snippets/additional_info.html @@ -1,4 +1,4 @@ -
    +

    {{ _('Additional Info') }}

    diff --git a/ckan/templates/package/snippets/package_basic_fields.html b/ckan/templates/package/snippets/package_basic_fields.html index 5920adc4412..9c8d26f500d 100644 --- a/ckan/templates/package/snippets/package_basic_fields.html +++ b/ckan/templates/package/snippets/package_basic_fields.html @@ -52,23 +52,51 @@ {% if data.group_id %} {% endif %} -{% set existing_org = data.owner_org or data.group_id %} -{% if h.check_access('sysadmin') or data.get('state', 'draft').startswith('draft') or data.get('state', 'none') == 'none' %} - {% set organizations_available = h.organizations_available('create_dataset') %} - {% if organizations_available %} + +{% set dataset_is_draft = data.get('state', 'draft').startswith('draft') or data.get('state', 'none') == 'none' %} +{% set dataset_has_organization = data.owner_org or data.group_id %} +{% set organizations_available = h.organizations_available('create_dataset') %} +{% set user_is_sysadmin = h.check_access('sysadmin') %} +{% set show_organizations_selector = organizations_available and (user_is_sysadmin or dataset_is_draft) %} +{% set show_visibility_selector = dataset_has_organization or (organizations_available and (user_is_sysadmin or dataset_is_draft)) %} + +{% if show_organizations_selector and show_visibility_selector %} +
    +{% endif %} + +{% if show_organizations_selector %} +
    + +
    + +
    +
    +{% endif %} + +{% if show_visibility_selector %} + {% block package_metadata_fields_visibility %}
    - +
    - + {% for option in [(true, _('Private')), (false, _('Public'))] %} + {% endfor %}
    - {% endif %} + {% endblock %} {% endif %} + +{% if show_organizations_selector and show_visibility_selector %} +
    +{% endif %} + {% endblock %} diff --git a/ckan/templates/package/snippets/package_metadata_fields.html b/ckan/templates/package/snippets/package_metadata_fields.html index 6bdfa51f140..fce09b1d8bc 100644 --- a/ckan/templates/package/snippets/package_metadata_fields.html +++ b/ckan/templates/package/snippets/package_metadata_fields.html @@ -2,21 +2,6 @@ {% block package_metadata_fields %} -{% block package_metadata_fields_visibility %} -{% if data.owner_org %} -
    - -
    - -
    -
    -{% endif %} -{% endblock %} - {% block package_metadata_author %} {{ form.input('author', label=_('Author'), id='field-author', placeholder=_('Joe Bloggs'), value=data.author, error=errors.author, classes=['control-medium']) }} diff --git a/ckan/templates/package/snippets/resource_item.html b/ckan/templates/package/snippets/resource_item.html index 103df3ec28b..fccd94ff4d2 100644 --- a/ckan/templates/package/snippets/resource_item.html +++ b/ckan/templates/package/snippets/resource_item.html @@ -24,14 +24,24 @@ {% block resource_item_explore_links %}
  • - - {{ _('Preview') }} + {% if res.can_be_previewed %} + + {{ _('Preview') }} + {% else %} + + {{ _('More information') }} + {% endif %}
  • - - {{ _('Download') }} + {% if res.can_be_previewed %} + + {{ _('Download') }} + {% else %} + + {{ _('Go to resource') }} + {% endif %}
    • {% endblock %} diff --git a/ckan/templates/package/snippets/resources_list.html b/ckan/templates/package/snippets/resources_list.html index f2327a5a915..7cd33a1c59b 100644 --- a/ckan/templates/package/snippets/resources_list.html +++ b/ckan/templates/package/snippets/resources_list.html @@ -9,7 +9,7 @@ {% snippet "package/snippets/resources_list.html", pkg=pkg, resources=pkg.resources %} #} -
    +

    {{ _('Data and Resources') }}

    {% block resource_list %} {% if resources %} diff --git a/ckan/templates/package/snippets/search_form.html b/ckan/templates/package/snippets/search_form.html deleted file mode 100644 index 35b01b2b2dc..00000000000 --- a/ckan/templates/package/snippets/search_form.html +++ /dev/null @@ -1,63 +0,0 @@ - - {% block search_form_input %} - - - - - {% endblock %} - {% block search_form_sortby %} - {% snippet 'snippets/sort_by.html', sort=c.sort_by_selected %} - {% endblock %} - {% block search_form_fields %} - {% if c.fields %} - - {% for key, value in c.fields %} - - {% endfor %} - - {% endif %} - {% endblock %} -
    - - -{% block search_form_results %} -
    - - {% block search_form_result_text %} - {% snippet 'snippets/search_result_text.html', query=c.q, count=c.page.item_count, type='dataset' %} - {% endblock %} - - {% block search_form_filter_list %} -
    - {% for field in c.fields_grouped %} - {{ c.facet_titles.get(field) }}: - {% for value in c.fields_grouped[field] %} - - {% if c.translated_fields and c.translated_fields.has_key((field,value)) %} - {{ c.translated_fields[(field,value)] }} - {% else %} - {{ value }} - {% endif %} - - - {% endfor %} - {% endfor %} -
    - {% endblock %} -
    -{% endblock %} - -{% block search_form_package_list %} -{% if c.query_error %} -

    - {% trans %} - There was an error while searching. Please try again. - {% endtrans %} -

    - -{% else %} - {% if c.page.items %} - {{ h.snippet('snippets/package_list.html', packages=c.page.items, bulk_processing=c.bulk_processing) }} - {% endif %} -{% endif %} -{% endblock %} diff --git a/ckan/templates/package/snippets/tags.html b/ckan/templates/package/snippets/tags.html index ab95b97bdc7..8d296d62ea2 100644 --- a/ckan/templates/package/snippets/tags.html +++ b/ckan/templates/package/snippets/tags.html @@ -1,5 +1,5 @@ {% if tags %} -
    +
    {% snippet 'snippets/tag_list.html', tags=tags, _class='tag-list well' %}
    {% endif %} diff --git a/ckan/templates/page.html b/ckan/templates/page.html index 01f50bfd1f7..0f2b3a57885 100644 --- a/ckan/templates/page.html +++ b/ckan/templates/page.html @@ -29,13 +29,6 @@ {% block toolbar %}
    - {% block add_action %} - {% if self.add_action_content() | trim %} -
    - {% block add_action_content %}{% endblock %} -
    - {% endif %} - {% endblock %} {% block breadcrumb %} {% if self.breadcrumb_content() | trim %}
      @@ -49,12 +42,6 @@
      - {% block actions %} -
      - {% block actions_content %}{% endblock %} -
      - {% endblock %} - {# The pre_primary block can be used to add content to before the rendering of the main content columns of the page. @@ -75,7 +62,31 @@

      My page content

      Some content for the page

      {% endblock %} #} - {% block primary_content %}{% endblock %} + {% block primary_content %} +
      + {% block page_header %} +
      + {% if self.content_action() | trim %} +
      + {% block content_action %}{% endblock %} +
      + {% endif %} +
        + {% block content_primary_nav %}{% endblock %} +
      +
      + {% endblock %} +
      + {% if self.page_primary_action() | trim %} +
      + {% block page_primary_action %}{% endblock %} +
      + {% endif %} + {% block primary_content_inner %} + {% endblock %} +
      +
      + {% endblock %}
      {% endblock %} diff --git a/ckan/templates/snippets/organization.html b/ckan/templates/snippets/organization.html index aefcb6ff81f..116cb6e3ac4 100644 --- a/ckan/templates/snippets/organization.html +++ b/ckan/templates/snippets/organization.html @@ -4,6 +4,9 @@ organization - The organization dict. truncate - A max length for the organization description. If not provided the description will be full length. +has_context_title - Boolean for whether to display a module-heading for when + this snippet appears within a non-organization template + (e.g. dataset page sidebar) Example: @@ -12,7 +15,10 @@ #} {% with truncate=truncate or 0, url=h.url_for(controller='organization', action='read', id=organization.name) %} -
      +
      + {% if has_context_title %} +

      {{ _('Organization') }}

      + {% endif %}
      @@ -43,6 +49,9 @@

      {{ organization.title or organization.name }}

      {{ h.SI_number_span(organization.package_count) }}
      + {% endif %}
      diff --git a/ckan/templates/snippets/search_form.html b/ckan/templates/snippets/search_form.html new file mode 100644 index 00000000000..6fdd9e1638e --- /dev/null +++ b/ckan/templates/snippets/search_form.html @@ -0,0 +1,80 @@ +{% import 'macros/form.html' as form %} + +{% set placeholder = placeholder if placeholder else _('Search...') %} +{% set sorting = sorting if sorting else [(_('Name Ascending'), 'name asc'), (_('Name Descending'), 'name desc')] %} +{% set search_class = search_class if search_class else 'search-giant' %} + +
      + + {% block search_input %} +
      + + +
      + {% endblock %} + + {% block search_search_fields %} + {% if fields -%} + {{ form.hidden_from_list(fields=fields) }} + {%- endif %} + {% endblock %} + + {% block search_sortby %} + {% if sorting %} +
      + + + +
      + {% endif %} + {% endblock %} + + {% block search_title %} + {% if not no_title %} +

      {% snippet 'snippets/search_result_text.html', query=query, count=count, type=type %}

      + {% endif %} + {% endblock %} + + {% block search_facets %} + {% if facets %} +

      + {% for field in facets.fields %} + {% set search_facets_items = facets.search.get(field)['items'] %} + {{ facets.titles.get(field) }}: + {% for value in facets.fields[field] %} + + {%- if facets.translated_fields and facets.translated_fields.has_key((field,value)) -%} + {{ facets.translated_fields[(field,value)] }} + {%- else -%} + {{ h.list_dict_filter(search_facets_items, 'name', 'display_name', value) }} + {%- endif %} + + + {% endfor %} + {% endfor %} +

      + {% endif %} + {% endblock %} + + + +{% if show_empty and count == 0 %} + {% trans %} +

      Please try another search.

      + {% endtrans %} +{% endif %} + +{% if error %} + {% trans %} +

      There was an error while searching. Please try again.

      + {% endtrans %} +{% endif %} diff --git a/ckan/templates/user/dashboard.html b/ckan/templates/user/dashboard.html index 5ee3e1edffd..f27dd66193e 100644 --- a/ckan/templates/user/dashboard.html +++ b/ckan/templates/user/dashboard.html @@ -1,55 +1,46 @@ {% extends "user/edit_base.html" %} -{% block add_action_content %} - {% if h.check_access('package_create') %} -
    1. {% link_for _('Add Dataset'), controller='package', action='new', class_="btn btn-primary", icon="plus-sign-alt" %}
      2. - {% endif %} +{% block breadcrumb_content %} +
    2. {{ _('Dashboard') }}
      3. {% endblock %} -{% block primary_content_inner %} -
      - {% snippet 'user/snippets/followee_dropdown.html', context=c.dashboard_activity_stream_context, followees=c.followee_list %} -

      - {% block page_heading %} - {{ _('News feed') }} - {% endblock %} - {{ _('Activity from items that you follow') }} -

      - {% block activity_stream %} - {{ c.dashboard_activity_stream }} - {% endblock %} -
      -{% endblock %} +{% block secondary %}{% endblock %} -{% block secondary_content %} - {% block dashboard_activity_stream_context %} - {% if not c.dashboard_activity_stream_context.dict == None %} -
      - - {% snippet 'snippets/context.html', type=c.dashboard_activity_stream_context.filter_type, dict=c.dashboard_activity_stream_context.dict %} +{% block primary %} +
      + {% block page_header %} +
      +
      + {% link_for _('Edit settings'), controller='user', action='edit', id=user.name, class_='btn', icon='cog' %} +
      +
        + {{ h.build_nav_icon('user_dashboard', _('News feed')) }} + {{ h.build_nav_icon('user_dashboard_datasets', _('My Datasets')) }} + {{ h.build_nav_icon('user_dashboard_organizations', _('My Organizations')) }} + {{ h.build_nav_icon('user_dashboard_groups', _('My Groups')) }} +
      +
      + {% endblock %} +
      + {% if self.page_primary_action() | trim %} +
      + {% block page_primary_action %}{% endblock %} +
      + {% endif %} + {% block primary_content_inner %} +
      + {% snippet 'user/snippets/followee_dropdown.html', context=c.dashboard_activity_stream_context, followees=c.followee_list %} +

      + {% block page_heading %} + {{ _('News feed') }} + {% endblock %} + {{ _("Activity from items that I'm following") }} +

      + {% block activity_stream %} + {{ c.dashboard_activity_stream }} + {% endblock %} +
      + {% endblock %}
      - {% endif %} - {% endblock %} - {% block dashboard_datasets %} -
      -

      - - {{ _('My Datasets') }} -

      - {% if c.user_dict['datasets'] %} -
        - {% for package in c.user_dict['datasets'] %} - {% set title = package.title or package.name %} -
      • - {{ h.link_to(h.truncate(title, 80), h.url_for(controller='package', action='read', id=package.name)) }} -
        • - {% endfor %} -
      - {% else %} -
      -

      {{ _('You do not have any datasets') }}

      -
      - {% endif %} -
      - {% endblock %} +
      {% endblock %} diff --git a/ckan/templates/user/dashboard_datasets.html b/ckan/templates/user/dashboard_datasets.html new file mode 100644 index 00000000000..75f0e82907a --- /dev/null +++ b/ckan/templates/user/dashboard_datasets.html @@ -0,0 +1,23 @@ +{% extends "user/dashboard.html" %} + +{% block dashboard_activity_stream_context %}{% endblock %} + +{% block page_primary_action %} + {% if h.check_access('package_create') %} + {% link_for _('Add Dataset'), controller='package', action='new', class_="btn btn-primary", icon="plus-sign-alt" %} + {% endif %} +{% endblock %} + +{% block primary_content_inner %} +

      {{ _('My Datasets') }}

      + {% if c.user_dict.datasets %} + {% snippet 'snippets/package_list.html', packages=c.user_dict.datasets %} + {% else %} +

      + {{ _('You haven\'t created any datasets.') }} + {% if h.check_access('package_create') %} + {% link_for _('Create one now?'), controller='package', action='new' %} + {% endif %} +

      + {% endif %} +{% endblock %} diff --git a/ckan/templates/user/dashboard_groups.html b/ckan/templates/user/dashboard_groups.html new file mode 100644 index 00000000000..446af5b13b5 --- /dev/null +++ b/ckan/templates/user/dashboard_groups.html @@ -0,0 +1,26 @@ +{% extends "user/dashboard.html" %} + +{% block dashboard_activity_stream_context %}{% endblock %} + +{% block page_primary_action %} + {% if h.check_access('group_create') %} + {% link_for _('Add Group'), controller='group', action='new', class_="btn btn-primary", icon="plus-sign-alt" %} + {% endif %} +{% endblock %} + +{% block primary_content_inner %} +

      {{ _('My Groups') }}

      + {% set groups = h.groups_available(am_member=True) %} + {% if groups %} +
      + {% snippet "group/snippets/group_list.html", groups=groups %} +
      + {% else %} +

      + {{ _('You are not a member of any groups.') }} + {% if h.check_access('group_create') %} + {% link_for _('Create one now?'), controller='group', action='new' %} + {% endif %} +

      + {% endif %} +{% endblock %} diff --git a/ckan/templates/user/dashboard_organizations.html b/ckan/templates/user/dashboard_organizations.html new file mode 100644 index 00000000000..4d1867dfd32 --- /dev/null +++ b/ckan/templates/user/dashboard_organizations.html @@ -0,0 +1,26 @@ +{% extends "user/dashboard.html" %} + +{% block dashboard_activity_stream_context %}{% endblock %} + +{% block page_primary_action %} + {% if h.check_access('organization_create') %} + {% link_for _('Add Organization'), controller='organization', action='new', class_="btn btn-primary", icon="plus-sign-alt" %} + {% endif %} +{% endblock %} + +{% block primary_content_inner %} +

      {{ _('My Organizations') }}

      + {% set organizations = h.organizations_available() %} + {% if organizations %} +
      + {% snippet "organization/snippets/organization_list.html", organizations=organizations %} +
      + {% else %} +

      + {{ _('You are not a member of any organizations.') }} + {% if h.check_access('organization_create') %} + {% link_for _('Create one now?'), controller='organization', action='new' %} + {% endif %} +

      + {% endif %} +{% endblock %} diff --git a/ckan/templates/user/edit.html b/ckan/templates/user/edit.html index 34203dba58a..7246dbc4e49 100644 --- a/ckan/templates/user/edit.html +++ b/ckan/templates/user/edit.html @@ -1,7 +1,16 @@ {% extends 'user/edit_base.html' %} -{% block actions_content %} - +{% block actions_content %}{% endblock %} + +{% block breadcrumb_content %} + {% if c.userobj.name == c.user_dict.name %} +
    3. {{ _('Dashboard') }}
      4. +
    4. {{ _('Edit settings') }}
      5. + {% else %} +
    5. {{ _('Users') }}
      6. +
    6. {{ c.user_dict.display_name }}
      7. +
    7. {{ _('Edit') }}
      8. + {% endif %} {% endblock %} {% block primary_content_inner %} diff --git a/ckan/templates/user/edit_base.html b/ckan/templates/user/edit_base.html index 4826aada4da..7e29720a60d 100644 --- a/ckan/templates/user/edit_base.html +++ b/ckan/templates/user/edit_base.html @@ -4,22 +4,8 @@ {% block subtitle %}{{ _('Dashboard') }}{% endblock %} -{% block breadcrumb_content %} -
    8. {{ _('Dashboard') }}
      9. -{% endblock %} - {% block primary_content %}
      - {% block page_header %} -
      -
        - {% block page_header_tabs %} - {{ h.build_nav_icon('user_dashboard', _('News feed')) }} - {{ h.build_nav_icon('user_edit', _('Settings'), id=user.name) }} - {% endblock %} -
      -
      - {% endblock %}
      {% block primary_content_inner %}{% endblock %}
      diff --git a/ckan/templates/user/read_base.html b/ckan/templates/user/read_base.html index b0a97403d43..aa27a2b4119 100644 --- a/ckan/templates/user/read_base.html +++ b/ckan/templates/user/read_base.html @@ -9,31 +9,15 @@ {{ h.build_nav('user_datasets', user.display_name|truncate(35), id=user.name) }} {% endblock %} -{% block actions_content %} +{% block content_action %} {% if h.check_access('user_update', user) %} -
    9. {% link_for _('Edit'), controller='user', action='edit', id=user.name, class_='btn btn-primary', icon='wrench' %}
      10. -{% endif %} -{% if c.is_myself == false %} -
    10. {{ h.follow_button('user', user.id) }}
      11. + {% link_for _('Edit'), controller='user', action='edit', id=user.name, class_='btn', icon='wrench' %} {% endif %} {% endblock %} -{% block primary_content %} -
      - {% block page_header %} -
      -
        - {% block page_header_tabs %} - {{ h.build_nav_icon('user_datasets', _('Datasets'), id=user.name) }} - {{ h.build_nav_icon('user_activity_stream', _('Activity Stream'), id=user.name) }} - {% endblock %} -
      -
      - {% endblock %} -
      - {% block primary_content_inner %}{% endblock %} -
      -
      +{% block content_primary_nav %} + {{ h.build_nav_icon('user_datasets', _('Datasets'), id=user.name) }} + {{ h.build_nav_icon('user_activity_stream', _('Activity Stream'), id=user.name) }} {% endblock %} {% block secondary_content %} @@ -67,6 +51,11 @@

      {{ user.display_name }}

      {{ h.SI_number_span(user.number_of_edits) }}
      + {% if c.is_myself == false %} + + {% endif %}
      {% if user.name.startswith('http://') or user.name.startswith('https://') %} diff --git a/ckan/templates_legacy/package/resource_read.html b/ckan/templates_legacy/package/resource_read.html index 42cde7217bd..b8d9b27d50a 100644 --- a/ckan/templates_legacy/package/resource_read.html +++ b/ckan/templates_legacy/package/resource_read.html @@ -146,8 +146,7 @@

      Preview

      - - ${ h.resource_preview(c.resource, c.package.id) } + ${ h.resource_preview(c.resource, c.package) }
      diff --git a/ckan/tests/functional/api/model/test_group_and_organization_purge.py b/ckan/tests/functional/api/model/test_group_and_organization_purge.py new file mode 100644 index 00000000000..0770642dbe3 --- /dev/null +++ b/ckan/tests/functional/api/model/test_group_and_organization_purge.py @@ -0,0 +1,410 @@ +'''Functional tests for the group_ and organization_purge APIs. + +''' +import ckan.model as model +import ckan.tests as tests + +import paste +import pylons.test + + +class TestGroupAndOrganizationPurging(object): + '''Tests for the group_ and organization_purge APIs. + + ''' + @classmethod + def setup_class(cls): + cls.app = paste.fixture.TestApp(pylons.test.pylonsapp) + + # Make a sysadmin user. + cls.sysadmin = model.User(name='test_sysadmin', sysadmin=True) + model.Session.add(cls.sysadmin) + model.Session.commit() + model.Session.remove() + + # A package that will be added to our test groups and organizations. + cls.package = tests.call_action_api(cls.app, 'package_create', + name='test_package', + apikey=cls.sysadmin.apikey) + + # A user who will not be a member of our test groups or organizations. + cls.visitor = tests.call_action_api(cls.app, 'user_create', + name='non_member', + email='blah', + password='farm', + apikey=cls.sysadmin.apikey) + + # A user who will become a member of our test groups and organizations. + cls.member = tests.call_action_api(cls.app, 'user_create', + name='member', + email='blah', + password='farm', + apikey=cls.sysadmin.apikey) + + # A user who will become an editor of our test groups and + # organizations. + cls.editor = tests.call_action_api(cls.app, 'user_create', + name='editor', + email='blah', + password='farm', + apikey=cls.sysadmin.apikey) + + # A user who will become an admin of our test groups and organizations. + cls.admin = tests.call_action_api(cls.app, 'user_create', + name='admin', + email='blah', + password='farm', + apikey=cls.sysadmin.apikey) + + @classmethod + def teardown_class(cls): + model.repo.rebuild_db() + + def _organization_create(self, organization_name): + '''Return an organization with some users and a dataset.''' + + # Make an organization with some users. + users = [{'name': self.member['name'], 'capacity': 'member'}, + {'name': self.editor['name'], 'capacity': 'editor'}, + {'name': self.admin['name'], 'capacity': 'admin'}] + organization = tests.call_action_api(self.app, 'organization_create', + apikey=self.sysadmin.apikey, + name=organization_name, + users=users) + + # Add a dataset to the organization (have to do this separately + # because the packages param of organization_create doesn't work). + tests.call_action_api(self.app, 'package_update', + name=self.package['name'], + owner_org=organization['name'], + apikey=self.sysadmin.apikey) + + return organization + + def _group_create(self, group_name): + '''Return a group with some users and a dataset.''' + + # Make a group with some users and a dataset. + group = tests.call_action_api(self.app, 'group_create', + apikey=self.sysadmin.apikey, + name=group_name, + users=[ + {'name': self.member['name'], + 'capacity': 'member', + }, + {'name': self.editor['name'], + 'capacity': 'editor', + }, + {'name': self.admin['name'], + 'capacity': 'admin', + }], + packages=[ + {'id': self.package['name']}], + ) + + return group + + def _test_group_or_organization_purge(self, name, by_id, is_org): + '''Create a group or organization with the given name, and test + purging it. + + :param name: the name of the group or organization to create and purge + :param by_id: if True, pass the organization's id to + organization_purge, otherwise pass its name + :type by_id: boolean + :param is_org: if True create and purge an organization, if False a + group + :type is_org: boolean + + ''' + if is_org: + group_or_org = self._organization_create(name) + else: + group_or_org = self._group_create(name) + + # Purge the group or organization. + if is_org: + action = 'organization_purge' + else: + action = 'group_purge' + if by_id: + identifier = group_or_org['id'] + else: + identifier = group_or_org['name'] + result = tests.call_action_api(self.app, action, id=identifier, + apikey=self.sysadmin.apikey, + ) + assert result is None + + # Now trying to show the group or organization should give a 404. + if is_org: + action = 'organization_show' + else: + action = 'group_show' + result = tests.call_action_api(self.app, action, id=name, status=404) + assert result == {'__type': 'Not Found Error', 'message': 'Not found'} + + # The group or organization should not appear in group_list or + # organization_list. + if is_org: + action = 'organization_list' + else: + action = 'group_list' + assert name not in tests.call_action_api(self.app, action) + + # The package should no longer belong to the group or organization. + package = tests.call_action_api(self.app, 'package_show', + id=self.package['name']) + if is_org: + assert package['organization'] is None + else: + assert group_or_org['name'] not in [group_['name'] for group_ + in package['groups']] + + # TODO: Also want to assert that user is not in group or organization + # anymore, but how to get a user's groups or organizations? + + # It should be possible to create a new group or organization with the + # same name as the purged one (you would not be able to do this if you + # had merely deleted the original group or organization). + if is_org: + action = 'organization_create' + else: + action = 'group_create' + new_group_or_org = tests.call_action_api(self.app, action, name=name, + apikey=self.sysadmin.apikey, + ) + assert new_group_or_org['name'] == name + + # TODO: Should we do a model-level check, to check that the group or + # org is really purged? + + def test_organization_purge_by_name(self): + '''A sysadmin should be able to purge an organization by name.''' + + self._test_group_or_organization_purge('organization-to-be-purged', + by_id=False, is_org=True) + + def test_group_purge_by_name(self): + '''A sysadmin should be able to purge a group by name.''' + self._test_group_or_organization_purge('group-to-be-purged', + by_id=False, is_org=False) + + def test_organization_purge_by_id(self): + '''A sysadmin should be able to purge an organization by id.''' + self._test_group_or_organization_purge('organization-to-be-purged-2', + by_id=True, is_org=True) + + def test_group_purge_by_id(self): + '''A sysadmin should be able to purge a group by id.''' + self._test_group_or_organization_purge('group-to-be-purged-2', + by_id=True, is_org=False) + + def _test_group_or_org_purge_with_invalid_id(self, is_org): + + if is_org: + action = 'organization_purge' + else: + action = 'group_purge' + + for name in ('foo', 'invalid name', None, ''): + # Try to purge an organization, but pass an invalid name. + result = tests.call_action_api(self.app, action, + apikey=self.sysadmin.apikey, + id=name, + status=404, + ) + if is_org: + message = 'Not found: Organization was not found' + else: + message = 'Not found: Group was not found' + assert result == {'__type': 'Not Found Error', 'message': message} + + def test_organization_purge_with_invalid_id(self): + ''' + Trying to purge an organization with an invalid ID should give a 404. + + ''' + self._test_group_or_org_purge_with_invalid_id(is_org=True) + + def test_group_purge_with_invalid_id(self): + '''Trying to purge a group with an invalid ID should give a 404.''' + self._test_group_or_org_purge_with_invalid_id(is_org=False) + + def _test_group_or_org_purge_with_missing_id(self, is_org): + if is_org: + action = 'organization_purge' + else: + action = 'group_purge' + result = tests.call_action_api(self.app, action, + apikey=self.sysadmin.apikey, + status=409, + ) + assert result == {'__type': 'Validation Error', + 'id': ['Missing value']} + + def test_organization_purge_with_missing_id(self): + '''Trying to purge an organization without passing an id should give + a 409.''' + self._test_group_or_org_purge_with_missing_id(is_org=True) + + def test_group_purge_with_missing_id(self): + '''Trying to purge a group without passing an id should give a 409.''' + self._test_group_or_org_purge_with_missing_id(is_org=False) + + def _test_visitors_cannot_purge_groups_or_orgs(self, is_org): + if is_org: + group_or_org = self._organization_create('org-to-be-purged-3') + else: + group_or_org = self._group_create('group-to-be-purged-3') + + # Try to purge the group or organization without an API key. + if is_org: + action = 'organization_purge' + else: + action = 'group_purge' + result = tests.call_action_api(self.app, action, id=group_or_org['id'], + status=403, + ) + assert result == {'__type': 'Authorization Error', + 'message': 'Access denied'} + + def test_visitors_cannot_purge_organizations(self): + '''Visitors (who aren't logged in) should not be authorized to purge + organizations. + + ''' + self._test_visitors_cannot_purge_groups_or_orgs(is_org=True) + + def test_visitors_cannot_purge_groups(self): + '''Visitors (who aren't logged in) should not be authorized to purge + groups. + + ''' + self._test_visitors_cannot_purge_groups_or_orgs(is_org=False) + + def _test_users_cannot_purge_groups_or_orgs(self, is_org): + if is_org: + group_or_org = self._organization_create('org-to-be-purged-4') + else: + group_or_org = self._group_create('group-to-be-purged-4') + + # Try to purge the group or organization with a non-member's API key. + if is_org: + action = 'organization_purge' + else: + action = 'group_purge' + result = tests.call_action_api(self.app, action, id=group_or_org['id'], + apikey=self.visitor['apikey'], + status=403, + ) + assert result == {'__type': 'Authorization Error', + 'message': 'Access denied'} + + def test_users_cannot_purge_organizations(self): + '''Users who are not members of an organization should not be + authorized to purge the organization. + + ''' + self._test_users_cannot_purge_groups_or_orgs(is_org=True) + + def test_users_cannot_purge_groups(self): + '''Users who are not members of a group should not be authorized to + purge the group. + + ''' + self._test_users_cannot_purge_groups_or_orgs(is_org=False) + + def _test_members_cannot_purge_groups_or_orgs(self, is_org): + if is_org: + group_or_org = self._organization_create('org-to-be-purged-5') + else: + group_or_org = self._group_create('group-to-be-purged-5') + + # Try to purge the organization with an organization member's API key. + if is_org: + action = 'organization_purge' + else: + action = 'group_purge' + result = tests.call_action_api(self.app, action, id=group_or_org['id'], + apikey=self.member['apikey'], + status=403, + ) + assert result == {'__type': 'Authorization Error', + 'message': 'Access denied'} + + def test_members_cannot_purge_organizations(self): + '''Members of an organization should not be authorized to purge the + organization. + + ''' + self._test_members_cannot_purge_groups_or_orgs(is_org=True) + + def test_members_cannot_purge_groups(self): + '''Members of a group should not be authorized to purge the group. + + ''' + self._test_members_cannot_purge_groups_or_orgs(is_org=False) + + def _test_editors_cannot_purge_groups_or_orgs(self, is_org): + if is_org: + group_or_org = self._organization_create('org-to-be-purged-6') + else: + group_or_org = self._group_create('group-to-be-purged-6') + + # Try to purge the group or organization with an editor's API key. + if is_org: + action = 'organization_purge' + else: + action = 'group_purge' + result = tests.call_action_api(self.app, action, id=group_or_org['id'], + apikey=self.editor['apikey'], + status=403, + ) + assert result == {'__type': 'Authorization Error', + 'message': 'Access denied'} + + def test_editors_cannot_purge_organizations(self): + '''Editors of an organization should not be authorized to purge the + organization. + + ''' + self._test_editors_cannot_purge_groups_or_orgs(is_org=True) + + def test_editors_cannot_purge_groups(self): + '''Editors of a group should not be authorized to purge the group. + + ''' + self._test_editors_cannot_purge_groups_or_orgs(is_org=False) + + def _test_admins_cannot_purge_groups_or_orgs(self, is_org): + if is_org: + group_or_org = self._organization_create('org-to-be-purged-7') + else: + group_or_org = self._group_create('group-to-be-purged-7') + + # Try to purge the group or organization with an admin's API key. + if is_org: + action = 'organization_purge' + else: + action = 'group_purge' + result = tests.call_action_api(self.app, action, + id=group_or_org['id'], + apikey=self.admin['apikey'], + status=403, + ) + assert result == {'__type': 'Authorization Error', + 'message': 'Access denied'} + + def test_admins_cannot_purge_organizations(self): + '''Admins of an organization should not be authorized to purge the + organization. + + ''' + self._test_admins_cannot_purge_groups_or_orgs(is_org=True) + + def test_admins_cannot_purge_groups(self): + '''Admins of a group should not be authorized to purge the group. + + ''' + self._test_admins_cannot_purge_groups_or_orgs(is_org=False) diff --git a/ckan/tests/functional/api/model/test_package.py b/ckan/tests/functional/api/model/test_package.py index 84ccd001419..f517dbfc783 100644 --- a/ckan/tests/functional/api/model/test_package.py +++ b/ckan/tests/functional/api/model/test_package.py @@ -11,6 +11,8 @@ from ckan.tests.functional.api.base import Api1TestCase as Version1TestCase from ckan.tests.functional.api.base import Api2TestCase as Version2TestCase +import ckan.tests as tests + # Todo: Remove this ckan.model stuff. import ckan.model as model @@ -776,6 +778,36 @@ def test_package_revisions(self): revisions = res.json assert len(revisions) == 3, len(revisions) + def test_create_private_package_with_no_organization(self): + '''Test that private packages with no organization cannot be created. + + ''' + testsysadmin = model.User.by_name('testsysadmin') + result = tests.call_action_api(self.app, 'package_create', name='test', + private=True, apikey=testsysadmin.apikey, status=409) + assert result == {'__type': 'Validation Error', + 'private': ["Datasets with no organization can't be private."]} + + def test_create_public_package_with_no_organization(self): + '''Test that public packages with no organization can be created.''' + testsysadmin = model.User.by_name('testsysadmin') + tests.call_action_api(self.app, 'package_create', name='test', + private=False, apikey=testsysadmin.apikey) + + def test_make_package_with_no_organization_private(self): + '''Test that private packages with no organization cannot be created + by package_update. + + ''' + testsysadmin = model.User.by_name('testsysadmin') + package = tests.call_action_api(self.app, 'package_create', + name='test_2', private=False, apikey=testsysadmin.apikey) + package['private'] = True + result = tests.call_action_api(self.app, 'package_update', + apikey=testsysadmin.apikey, status=409, **package) + assert result == {'__type': 'Validation Error', + 'private': ["Datasets with no organization can't be private."]} + class TestPackagesVersion1(Version1TestCase, PackagesTestCase): def test_06_create_pkg_using_download_url(self): diff --git a/ckan/tests/functional/api/test_activity.py b/ckan/tests/functional/api/test_activity.py index f3028ba8f09..5c2bde06d9e 100644 --- a/ckan/tests/functional/api/test_activity.py +++ b/ckan/tests/functional/api/test_activity.py @@ -18,6 +18,7 @@ import paste.fixture from nose import SkipTest from ckan.common import json +import ckan.tests as tests ##def package_update(context, data_dict): @@ -2207,3 +2208,53 @@ def test_related_item_deleted(self): assert activity_response_dict['result'][0]['user_id'] == user['id'] assert (activity_response_dict['result'][0]['data']['related']['id'] == response_dict['result']['id']) + + def test_no_activity_when_creating_private_dataset(self): + '''There should be no activity when a private dataset is created.''' + + user = self.normal_user + organization = tests.call_action_api(self.app, 'organization_create', + name='another_test_org', apikey=user['apikey']) + dataset = tests.call_action_api(self.app, 'package_create', + apikey=user['apikey'], + name='test_private_dataset', + owner_org=organization['id'], private=True) + activity_stream = tests.call_action_api(self.app, + 'package_activity_list', id=dataset['id'], + apikey=user['apikey']) + assert activity_stream == [] + + def test_no_activity_when_updating_private_dataset(self): + '''There should be no activity when a private dataset is created.''' + + user = self.normal_user + organization = tests.call_action_api(self.app, 'organization_create', + name='test_org_3', apikey=user['apikey']) + dataset = tests.call_action_api(self.app, 'package_create', + apikey=user['apikey'], + name='test_private_dataset_2', + owner_org=organization['id'], private=True) + dataset['notes'] = 'updated' + updated_dataset = tests.call_action_api(self.app, 'package_update', + apikey=user['apikey'], **dataset) + activity_stream = tests.call_action_api(self.app, + 'package_activity_list', id=dataset['id'], + apikey=user['apikey']) + assert activity_stream == [] + + def test_no_activity_when_deleting_private_dataset(self): + '''There should be no activity when a private dataset is created.''' + + user = self.normal_user + organization = tests.call_action_api(self.app, 'organization_create', + name='test_org_4', apikey=user['apikey']) + dataset = tests.call_action_api(self.app, 'package_create', + apikey=user['apikey'], + name='test_private_dataset_3', + owner_org=organization['id'], private=True) + deleted_dataset = tests.call_action_api(self.app, 'package_delete', + apikey=user['apikey'], id=dataset['id']) + activity_stream = tests.call_action_api(self.app, + 'package_activity_list', id=dataset['id'], + apikey=user['apikey']) + assert activity_stream == [] diff --git a/ckan/tests/functional/test_package.py b/ckan/tests/functional/test_package.py index 4c2adeb3de4..2112ba3bda5 100644 --- a/ckan/tests/functional/test_package.py +++ b/ckan/tests/functional/test_package.py @@ -530,7 +530,7 @@ def test_read_revision1(self): side_html = self.named_div('sidebar', res) print 'MAIN', main_html assert 'This is an old revision of this dataset' in main_html - assert 'at Jan 01, 2011, 00:00' in main_html + assert 'at January 1, 2011, 00:00' in main_html self.check_named_element(main_html, 'a', 'href="/dataset/%s"' % self.pkg_name) print 'PKG', pkg_html assert 'title1' in res @@ -548,7 +548,7 @@ def test_read_revision2(self): side_html = self.named_div('sidebar', res) print 'MAIN', main_html assert 'This is an old revision of this dataset' in main_html - assert 'at Jan 02, 2011, 00:00' in main_html + assert 'at January 2, 2011, 00:00' in main_html self.check_named_element(main_html, 'a', 'href="/dataset/%s"' % self.pkg_name) print 'PKG', pkg_html assert 'title2' in res @@ -567,7 +567,7 @@ def test_read_revision3(self): print 'MAIN', main_html assert 'This is an old revision of this dataset' not in main_html assert 'This is the current revision of this dataset' in main_html - assert 'at Jan 03, 2011, 00:00' in main_html + assert 'at January 3, 2011, 00:00' in main_html self.check_named_element(main_html, 'a', 'href="/dataset/%s"' % self.pkg_name) print 'PKG', pkg_html assert 'title3' in res diff --git a/ckan/tests/functional/test_user.py b/ckan/tests/functional/test_user.py index d0af5df355f..0ef528fd9ad 100644 --- a/ckan/tests/functional/test_user.py +++ b/ckan/tests/functional/test_user.py @@ -99,9 +99,10 @@ def test_user_login_page(self): assert 'Don\'t have an OpenID' in res, res def test_logout(self): - res = self.app.get('/user/logout') + res = self.app.get('/user/_logout') res2 = res.follow() - res2 = res2.follow() + while res2.status == 302: + res2 = res2.follow() assert 'You have logged out successfully.' in res2, res2 def _get_cookie_headers(self, res): @@ -142,6 +143,7 @@ def test_login(self): # then get redirected to user's dashboard res = res.follow() + res = res.follow() assert_equal(res.status, 302) assert res.header('Location').startswith('http://localhost/dashboard') or \ res.header('Location').startswith('/dashboard') @@ -214,6 +216,7 @@ def test_login_wrong_password(self): # then get redirected to login res = res.follow() + res = res.follow() assert_equal(res.status, 302) assert res.header('Location').startswith('http://localhost/user/login') or \ res.header('Location').startswith('/user/login') @@ -336,9 +339,10 @@ def test_register_whilst_logged_in(self): assert 'logout' in res.body, res.body # logout and login as user B - res = self.app.get('/user/logout') + res = self.app.get('/user/_logout') res2 = res.follow() - res2 = res2.follow() + while res2.status == 302: + res2 = res2.follow() assert 'You have logged out successfully.' in res2, res2 offset = url_for(controller='user', action='login') res = self.app.get(offset) diff --git a/ckan/tests/lib/test_helpers.py b/ckan/tests/lib/test_helpers.py index e088ad9c369..928d5dc34d1 100644 --- a/ckan/tests/lib/test_helpers.py +++ b/ckan/tests/lib/test_helpers.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -import time import datetime from nose.tools import assert_equal, assert_raises @@ -25,11 +24,11 @@ def test_extract_markdown(self): def test_render_datetime(self): res = h.render_datetime(datetime.datetime(2008, 4, 13, 20, 40, 20, 123456)) - assert_equal(res, 'Apr 13, 2008') + assert_equal(res, 'April 13, 2008') def test_render_datetime_but_from_string(self): res = h.render_datetime('2008-04-13T20:40:20.123456') - assert_equal(res, 'Apr 13, 2008') + assert_equal(res, 'April 13, 2008') def test_render_datetime_blank(self): res = h.render_datetime(None) diff --git a/ckan/tests/logic/test_action.py b/ckan/tests/logic/test_action.py index 6a5d4600e10..ddf9d3576a3 100644 --- a/ckan/tests/logic/test_action.py +++ b/ckan/tests/logic/test_action.py @@ -10,6 +10,7 @@ from ckan.lib.create_test_data import CreateTestData from ckan.lib.dictization.model_dictize import resource_dictize import ckan.model as model +import ckan.tests as tests from ckan.tests import WsgiAppCase from ckan.tests.functional.api import assert_dicts_equal_ignoring_ordering from ckan.tests import setup_test_search_index, search_related @@ -223,12 +224,10 @@ def test_03_create_update_package(self): def test_03_create_private_package(self): - def _do_request(package_dict): - postparams = '%s=1' % json.dumps(package_dict) - res = self.app.post('/api/action/package_create', params=postparams, - extra_environ={'Authorization': str(self.sysadmin_user.apikey)}) - package_created = json.loads(res.body)['result'] - return package_created + # Make an organization, because private datasets must belong to one. + organization = tests.call_action_api(self.app, 'organization_create', + name='test_org', + apikey=self.sysadmin_user.apikey) # Create a dataset without specifying visibility package_dict = { @@ -254,24 +253,32 @@ def _do_request(package_dict): 'tags': [{'name': u'russian'}, {'name': u'tolstoy'}], 'title': u'A Novel By Tolstoy', 'url': u'http://www.annakarenina.com', + 'owner_org': organization['id'], 'version': u'0.7a', } - - package_created = _do_request(package_dict) + package_created = tests.call_action_api(self.app, 'package_create', + apikey=self.sysadmin_user.apikey, + **package_dict) assert package_created['private'] is False # Create a new one, explicitly saying it is public package_dict['name'] = u'annakareninanew_vis_public' package_dict['private'] = False - package_created_public = _do_request(package_dict) + package_created_public = tests.call_action_api(self.app, + 'package_create', + apikey=self.sysadmin_user.apikey, + **package_dict) assert package_created_public['private'] is False # Create a new one, explicitly saying it is private package_dict['name'] = u'annakareninanew_vis_private' package_dict['private'] = True - package_created_private = _do_request(package_dict) + package_created_private = tests.call_action_api(self.app, + 'package_create', + apikey=self.sysadmin_user.apikey, + **package_dict) assert package_created_private['private'] is True @@ -684,10 +691,11 @@ def test_19_update_resource(self): resource_updated.pop('url') resource_updated.pop('revision_id') + resource_updated.pop('revision_timestamp') resource_created.pop('url') resource_created.pop('revision_id') resource_created.pop('revision_timestamp') - assert resource_updated == resource_created + assert_equal(resource_updated, resource_created) def test_20_task_status_update(self): package_created = self._add_basic_package(u'test_task_status_update') @@ -896,7 +904,7 @@ def test_28_group_package_show(self): assert group_names == set(['annakarenina', 'warandpeace']), group_names def test_29_group_package_show_pending(self): - context = {'model': model, 'session': model.Session, 'user': self.sysadmin_user.name, 'api_version': 2} + context = {'model': model, 'session': model.Session, 'user': self.sysadmin_user.name, 'api_version': 2, 'ignore_auth': True} group = { 'name': 'test_group_pending_package', 'packages': [{'id': model.Package.get('annakarenina').id}] diff --git a/ckan/tests/test_coding_standards.py b/ckan/tests/test_coding_standards.py index f5961074d32..69a9f1ed4f8 100644 --- a/ckan/tests/test_coding_standards.py +++ b/ckan/tests/test_coding_standards.py @@ -20,6 +20,7 @@ import re import cStringIO import inspect +import itertools import pep8 @@ -27,14 +28,14 @@ base_path = os.path.abspath(os.path.join(file_path, '..', '..')) -def process_directory(directory): +def process_directory(directory, ext='.py'): base_len = len(base_path) + 1 for (dirpath, dirnames, filenames) in os.walk(directory): # ignore hidden files and dir filenames = [f for f in filenames if not f[0] == '.'] dirnames[:] = [d for d in dirnames if not d[0] == '.'] for name in filenames: - if name.endswith('.py'): + if name.endswith(ext): path = os.path.join(dirpath, name) filename = path[base_len:] yield path, filename @@ -65,7 +66,103 @@ def show_passing(msg, errors): raise Exception('\n%s\n\n' % msg + '\n'.join(sorted(errors))) +def cs_filter(f, filter_, ignore_comment_lines=True): + ''' filter the file removing comments if requested. + looks for comments like + # CS: ignore + # CS: ignore x line + and removes the requested number of lines. Lines are removed by + blanking so the line numbers reported will be correct. This allows us + to check files that have known violations of the test rules. ''' + + # this RegEx is of poor quality but works + exp = r'^\s*#\s+CS:.*%s.*ignore\D*((\d+)\s+line)*' + re_ignore = re.compile(exp % filter_) + ignore = 0 + out = [] + count = 1 + for line in f: + # ignore the line if we have been told too + if ignore > 0: + line = '' + ignore -= 1 + matches = re_ignore.search(line) + if matches: + ignore = int(matches.group(2) or 1) + # ignore comments out lines + if ignore_comment_lines and line.lstrip().startswith('#'): + line = '' + out.append(line) + count += 1 + return out + + +class TestBadSpellings(object): + + BAD_SPELLING_BLACKLIST_FILES = [ + 'ckan/lib/navl/__init__.py', + ] + + # these are the bad spellings with the correct spelling + # use LOWER case + BAD_SPELLINGS = { + # CS: bad_spelling ignore 2 lines + 'licence': 'license', + 'organisation': 'organization', + } + + fails = {} + passes = [] + done = False + + @classmethod + def setup(cls): + if not cls.done: + cls.process() + cls.done = True + + @classmethod + def process(cls): + blacklist = cls.BAD_SPELLING_BLACKLIST_FILES + re_bad_spelling = re.compile( + r'(%s)' % '|'.join([x for x in cls.BAD_SPELLINGS]), + flags=re.IGNORECASE + ) + files = itertools.chain.from_iterable([ + process_directory(base_path), + process_directory(base_path, ext='.rst')]) + for path, filename in files: + f = open(path, 'r') + count = 1 + errors = [] + for line in cs_filter(f, 'bad_spelling'): + matches = re_bad_spelling.findall(line) + if matches: + bad_words = [] + for m in matches: + if m not in bad_words: + bad_words.append('%s use %s' % + (m, cls.BAD_SPELLINGS[m.lower()])) + bad = ', '.join(bad_words) + errors.append('ln:%s \t%s\n<%s>' % (count, line[:-1], bad)) + count += 1 + if errors and not filename in blacklist: + cls.fails[filename] = output_errors(filename, errors) + elif not errors and filename in blacklist: + cls.passes.append(filename) + + def test_good(self): + msg = 'The following files passed bad spellings rules' + msg += '\nThey need removing from the test blacklist' + show_passing(msg, self.passes) + + def test_bad(self): + msg = 'The following files have bad spellings that need fixing' + show_fails(msg, self.fails) + + class TestNastyString(object): + # CS: nasty_string ignore ''' Look for a common coding problem in ckan '..%s..' % str(x) ''' # Nasty str() issues @@ -77,17 +174,6 @@ class TestNastyString(object): # any place. NASTY_STR_BLACKLIST_FILES = [ - 'ckan/ckan_nose_plugin.py', - 'ckan/controllers/api.py', - 'ckan/controllers/group.py', - 'ckan/lib/activity_streams.py', - 'ckan/logic/action/create.py', - 'ckan/logic/action/update.py', - 'ckan/logic/auth/create.py', - 'ckan/logic/auth/delete.py', - 'ckan/logic/auth/get.py', - 'ckan/logic/validators.py', - 'ckan/tests/test_coding_standards.py', # example causes error 'ckan/tests/functional/api/test_revision_search.py', 'ckan/tests/functional/test_pagination.py', 'ckan/tests/models/test_package_relationships.py', @@ -112,7 +198,7 @@ def process(cls): f = open(path, 'r') count = 1 errors = [] - for line in f: + for line in cs_filter(f, 'nasty_string'): if re_nasty_str.search(line): errors.append('ln:%s \t%s' % (count, line[:-1])) count += 1 @@ -127,6 +213,7 @@ def test_good(self): show_passing(msg, self.passes) def test_bad(self): + # CS: nasty_string ignore next 2 lines msg = ('The following files have nasty str() issues that need' ' resolving\nCode is like `\'...%s..\' % str(..)`' 'and should just be `\'...%s..\' % ..`') @@ -505,7 +592,6 @@ class TestPep8(object): 'ckan/lib/captcha.py', 'ckan/lib/cli.py', 'ckan/lib/create_test_data.py', - 'ckan/lib/datapreview.py', 'ckan/lib/dictization/__init__.py', 'ckan/lib/dictization/model_dictize.py', 'ckan/lib/dictization/model_save.py', @@ -612,7 +698,6 @@ class TestPep8(object): 'ckan/migration/versions/063_org_changes.py', 'ckan/migration/versions/064_add_email_last_sent_column.py', 'ckan/migration/versions/065_add_email_notifications_preference.py', - 'ckan/migration/versions/066_default_package_type.py', 'ckan/migration/versions/067_turn_extras_to_strings.py', 'ckan/misc.py', 'ckan/model/__init__.py', @@ -755,13 +840,11 @@ class TestPep8(object): 'ckanext/datastore/tests/test_create.py', 'ckanext/datastore/tests/test_delete.py', 'ckanext/datastore/tests/test_search.py', - 'ckanext/datastore/tests/test_unit.py', 'ckanext/datastore/tests/test_upsert.py', 'ckanext/example_idatasetform/plugin.py', 'ckanext/example_itemplatehelpers/plugin.py', 'ckanext/multilingual/plugin.py', 'ckanext/multilingual/tests/test_multilingual_plugin.py', - 'ckanext/pdfpreview/plugin.py', 'ckanext/reclinepreview/plugin.py', 'ckanext/reclinepreview/tests/test_preview.py', 'ckanext/resourceproxy/plugin.py', @@ -907,16 +990,11 @@ class TestActionAuth(object): ACTION_NO_DOC_STR_BLACKLIST = [ 'create: group_create_rest', - 'create: group_member_create', - 'create: organization_member_create', 'create: package_create_rest', 'create: package_relationship_create_rest', - 'delete: group_member_delete', - 'delete: organization_member_delete', 'delete: package_relationship_delete_rest', 'get: get_site_user', 'get: group_show_rest', - 'get: member_roles_list', 'get: package_show_rest', 'get: tag_show_rest', 'update: group_update_rest', diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py index d98f18c4e77..391829e412b 100644 --- a/ckanext/datastore/db.py +++ b/ckanext/datastore/db.py @@ -114,7 +114,7 @@ def _validate_int(i, field_name, non_negative=False): }) -def _get_engine(context, data_dict): +def _get_engine(data_dict): '''Get either read or write engine.''' connection_url = data_dict['connection_url'] engine = _engines.get(connection_url) @@ -137,14 +137,19 @@ def _cache_types(context): if 'nested' not in _type_names: native_json = _pg_version_is_at_least(connection, '9.2') - connection.execute('''CREATE TYPE "nested" - AS (json {0}, extra text)'''.format( - 'json' if native_json else 'text')) - _pg_types.clear() - - log.info("Created nested type. Native JSON: {0}".format( + log.info("Create nested type. Native JSON: {0}".format( native_json)) + import pylons + data_dict = { + 'connection_url': pylons.config['ckan.datastore.write_url']} + engine = _get_engine(data_dict) + with engine.begin() as connection: + connection.execute( + 'CREATE TYPE "nested" AS (json {0}, extra text)'.format( + 'json' if native_json else 'text')) + _pg_types.clear() + ## redo cache types with json now available. return _cache_types(context) @@ -334,14 +339,14 @@ def create_table(context, data_dict): fields = datastore_fields + supplied_fields + extra_fields sql_fields = u", ".join([u'"{0}" {1}'.format( - f['id'].replace('%', '%%'), f['type']) for f in fields]) + f['id'], f['type']) for f in fields]) sql_string = u'CREATE TABLE "{0}" ({1});'.format( data_dict['resource_id'], sql_fields ) - context['connection'].execute(sql_string) + context['connection'].execute(sql_string.replace('%', '%%')) def _get_aliases(context, data_dict): @@ -454,9 +459,9 @@ def generate_index_name(): index)] }) fields_string = u', '.join( - ['(("{0}").json::text)'.format(field.replace('%', '%%')) + ['(("{0}").json::text)'.format(field) if field in json_fields else - '"%s"' % field.replace('%', '%%') + '"%s"' % field for field in index_fields]) sql_index_strings.append(sql_index_string.format( res_id=data_dict['resource_id'], @@ -464,6 +469,7 @@ def generate_index_name(): name=generate_index_name(), fields=fields_string)) + sql_index_strings = map(lambda x: x.replace('%', '%%'), sql_index_strings) map(context['connection'].execute, sql_index_strings) @@ -546,9 +552,9 @@ def alter_table(context, data_dict): for field in new_fields: sql = 'ALTER TABLE "{0}" ADD "{1}" {2}'.format( data_dict['resource_id'], - field['id'].replace('%', '%%'), + field['id'], field['type']) - context['connection'].execute(sql) + context['connection'].execute(sql.replace('%', '%%')) def insert_data(context, data_dict): @@ -914,9 +920,13 @@ def search_data(context, data_dict): rank=rank_column, resource=data_dict['resource_id'], ts_query=ts_query, - where=where_clause, - sort=sort, limit=limit, offset=offset) - results = context['connection'].execute(sql_string, [where_values]) + where='{where}', + sort=sort, + limit=limit, + offset=offset) + sql_string = sql_string.replace('%', '%%') + results = context['connection'].execute( + sql_string.format(where=where_clause), [where_values]) _insert_links(data_dict, limit, offset) return format_results(context, results, data_dict) @@ -972,7 +982,7 @@ def create(context, data_dict): Any error results in total failure! For now pass back the actual error. Should be transactional. ''' - engine = _get_engine(context, data_dict) + engine = _get_engine(data_dict) context['connection'] = engine.connect() timeout = context.get('query_timeout', _TIMEOUT) _cache_types(context) @@ -1037,7 +1047,7 @@ def upsert(context, data_dict): Any error results in total failure! For now pass back the actual error. Should be transactional. ''' - engine = _get_engine(context, data_dict) + engine = _get_engine(data_dict) context['connection'] = engine.connect() timeout = context.get('query_timeout', _TIMEOUT) @@ -1080,7 +1090,7 @@ def upsert(context, data_dict): def delete(context, data_dict): - engine = _get_engine(context, data_dict) + engine = _get_engine(data_dict) context['connection'] = engine.connect() _cache_types(context) @@ -1104,7 +1114,7 @@ def delete(context, data_dict): def search(context, data_dict): - engine = _get_engine(context, data_dict) + engine = _get_engine(data_dict) context['connection'] = engine.connect() timeout = context.get('query_timeout', _TIMEOUT) _cache_types(context) @@ -1119,14 +1129,19 @@ def search(context, data_dict): 'query': ['Search took too long'] }) raise ValidationError({ - 'query': ['Invalid query'] + 'query': ['Invalid query'], + 'info': { + 'statement': [e.statement], + 'params': [e.params], + 'orig': [str(e.orig)] + } }) finally: context['connection'].close() def search_sql(context, data_dict): - engine = _get_engine(context, data_dict) + engine = _get_engine(data_dict) context['connection'] = engine.connect() timeout = context.get('query_timeout', _TIMEOUT) _cache_types(context) @@ -1198,7 +1213,7 @@ def _change_privilege(context, data_dict, what): def make_private(context, data_dict): log.info('Making resource {0} private'.format( data_dict['resource_id'])) - engine = _get_engine(context, data_dict) + engine = _get_engine(data_dict) context['connection'] = engine.connect() trans = context['connection'].begin() try: @@ -1211,7 +1226,7 @@ def make_private(context, data_dict): def make_public(context, data_dict): log.info('Making resource {0} public'.format( data_dict['resource_id'])) - engine = _get_engine(context, data_dict) + engine = _get_engine(data_dict) context['connection'] = engine.connect() trans = context['connection'].begin() try: diff --git a/ckanext/datastore/logic/action.py b/ckanext/datastore/logic/action.py index 01fef0a6c53..bc6668e070e 100644 --- a/ckanext/datastore/logic/action.py +++ b/ckanext/datastore/logic/action.py @@ -68,7 +68,7 @@ def datastore_create(context, data_dict): for alias in aliases: if not db._is_valid_table_name(alias): raise p.toolkit.ValidationError({ - 'alias': ['"{0}" is not a valid alias name'.format(alias)] + 'alias': [u'"{0}" is not a valid alias name'.format(alias)] }) # create a private datastore resource, if necessary @@ -132,12 +132,12 @@ def datastore_upsert(context, data_dict): res_id = data_dict['resource_id'] resources_sql = sqlalchemy.text(u'''SELECT 1 FROM "_table_metadata" WHERE name = :id AND alias_of IS NULL''') - results = db._get_engine(None, data_dict).execute(resources_sql, id=res_id) + results = db._get_engine(data_dict).execute(resources_sql, id=res_id) res_exists = results.rowcount > 0 if not res_exists: raise p.toolkit.ObjectNotFound(p.toolkit._( - 'Resource "{0}" was not found.'.format(res_id) + u'Resource "{0}" was not found.'.format(res_id) )) p.toolkit.check_access('datastore_upsert', context, data_dict) @@ -176,12 +176,12 @@ def datastore_delete(context, data_dict): res_id = data_dict['resource_id'] resources_sql = sqlalchemy.text(u'''SELECT 1 FROM "_table_metadata" WHERE name = :id AND alias_of IS NULL''') - results = db._get_engine(None, data_dict).execute(resources_sql, id=res_id) + results = db._get_engine(data_dict).execute(resources_sql, id=res_id) res_exists = results.rowcount > 0 if not res_exists: raise p.toolkit.ObjectNotFound(p.toolkit._( - 'Resource "{0}" was not found.'.format(res_id) + u'Resource "{0}" was not found.'.format(res_id) )) p.toolkit.check_access('datastore_delete', context, data_dict) @@ -260,7 +260,7 @@ def datastore_search(context, data_dict): resources_sql = sqlalchemy.text(u'''SELECT alias_of FROM "_table_metadata" WHERE name = :id''') - results = db._get_engine(None, data_dict).execute(resources_sql, id=res_id) + results = db._get_engine(data_dict).execute(resources_sql, id=res_id) # Resource only has to exist in the datastore (because it could be an alias) if not results.rowcount > 0: @@ -349,7 +349,7 @@ def datastore_make_private(context, data_dict): if not _resource_exists(context, data_dict): raise p.toolkit.ObjectNotFound(p.toolkit._( - 'Resource "{0}" was not found.'.format(res_id) + u'Resource "{0}" was not found.'.format(res_id) )) p.toolkit.check_access('datastore_change_permissions', context, data_dict) @@ -375,7 +375,7 @@ def datastore_make_public(context, data_dict): if not _resource_exists(context, data_dict): raise p.toolkit.ObjectNotFound(p.toolkit._( - 'Resource "{0}" was not found.'.format(res_id) + u'Resource "{0}" was not found.'.format(res_id) )) data_dict['connection_url'] = pylons.config.get('ckan.datastore.write_url') @@ -391,5 +391,5 @@ def _resource_exists(context, data_dict): resources_sql = sqlalchemy.text(u'''SELECT 1 FROM "_table_metadata" WHERE name = :id AND alias_of IS NULL''') - results = db._get_engine(None, data_dict).execute(resources_sql, id=res_id) + results = db._get_engine(data_dict).execute(resources_sql, id=res_id) return results.rowcount > 0 diff --git a/ckanext/datastore/plugin.py b/ckanext/datastore/plugin.py index 90b46c56f39..9f4861a9b5a 100644 --- a/ckanext/datastore/plugin.py +++ b/ckanext/datastore/plugin.py @@ -54,7 +54,7 @@ def configure(self, config): self.read_url = self.config['ckan.datastore.read_url'] read_engine = db._get_engine( - None, {'connection_url': self.read_url}) + {'connection_url': self.read_url}) if not model.engine_is_pg(read_engine): log.warn('We detected that you do not use a PostgreSQL ' 'database. The DataStore will NOT work and DataStore ' @@ -147,8 +147,7 @@ def _is_read_only_database(self): ''' Returns True if no connection has CREATE privileges on the public schema. This is the case if replication is enabled.''' for url in [self.ckan_url, self.write_url, self.read_url]: - connection = db._get_engine(None, - {'connection_url': url}).connect() + connection = db._get_engine({'connection_url': url}).connect() try: sql = u"SELECT has_schema_privilege('public', 'CREATE')" is_writable = connection.execute(sql).first()[0] @@ -173,10 +172,10 @@ def _read_connection_has_correct_privileges(self): only user. A table is created by the write user to test the read only user. ''' - write_connection = db._get_engine(None, { - 'connection_url': self.write_url}).connect() - read_connection = db._get_engine(None, { - 'connection_url': self.read_url}).connect() + write_connection = db._get_engine( + {'connection_url': self.write_url}).connect() + read_connection = db._get_engine( + {'connection_url': self.read_url}).connect() drop_foo_sql = u'DROP TABLE IF EXISTS _foo' @@ -220,8 +219,8 @@ def _create_alias_table(self): ''' create_alias_table_sql = u'CREATE OR REPLACE VIEW "_table_metadata" AS {0}'.format(mapping_sql) try: - connection = db._get_engine(None, { - 'connection_url': self.write_url}).connect() + connection = db._get_engine( + {'connection_url': self.write_url}).connect() connection.execute(create_alias_table_sql) finally: connection.close() @@ -246,7 +245,6 @@ def get_auth_functions(self): 'datastore_change_permissions': auth.datastore_change_permissions} def before_map(self, m): - print "Load mapping" m.connect('/datastore/dump/{resource_id}', controller='ckanext.datastore.controller:DatastoreController', action='dump') diff --git a/ckanext/datastore/tests/test_create.py b/ckanext/datastore/tests/test_create.py index 1603d85a197..301e6c5861e 100644 --- a/ckanext/datastore/tests/test_create.py +++ b/ckanext/datastore/tests/test_create.py @@ -27,7 +27,7 @@ def setup_class(cls): ctd.CreateTestData.create() cls.sysadmin_user = model.User.get('testsysadmin') cls.normal_user = model.User.get('annafan') - engine = db._get_engine(None, + engine = db._get_engine( {'connection_url': pylons.config['ckan.datastore.write_url']}) cls.Session = orm.scoped_session(orm.sessionmaker(bind=engine)) @@ -79,7 +79,7 @@ def test_create_invalid_alias_name(self): data = { 'resource_id': resource.id, - 'aliases': u'fo%25bar', + 'aliases': u'fo%25bar', # alias with percent 'fields': [{'id': 'book', 'type': 'text'}, {'id': 'author', 'type': 'text'}] } @@ -294,7 +294,7 @@ def test_create_basic(self): data = { 'resource_id': resource.id, 'aliases': aliases, - 'fields': [{'id': 'boo%k', 'type': 'text'}, + 'fields': [{'id': 'boo%k', 'type': 'text'}, # column with percent {'id': 'author', 'type': 'json'}], 'indexes': [['boo%k', 'author'], 'author'], 'records': [{'boo%k': 'crime', 'author': ['tolstoy', 'dostoevsky']}, @@ -362,7 +362,7 @@ def test_create_basic(self): res = self.app.post('/api/action/resource_show', params=postparams, extra_environ=auth) res_dict = json.loads(res.body) - assert res_dict['result']['datastore_active'] == True + assert res_dict['result']['datastore_active'] ####### insert again simple data2 = { @@ -514,10 +514,11 @@ def test_create_basic(self): assert res_dict['success'] is True, res_dict - ####### insert with paramter id rather than resource_id which is a shortcut + ####### insert with parameter id rather than resource_id which is a shortcut data8 = { 'id': resource.id, - 'records': [{'boo%k': 'warandpeace'}] + # insert with percent + 'records': [{'boo%k': 'warandpeace', 'author': '99% good'}] } postparams = '%s=1' % json.dumps(data8) diff --git a/ckanext/datastore/tests/test_delete.py b/ckanext/datastore/tests/test_delete.py index cfc69035d51..ce1b02efdb1 100644 --- a/ckanext/datastore/tests/test_delete.py +++ b/ckanext/datastore/tests/test_delete.py @@ -30,14 +30,17 @@ def setup_class(cls): resource = model.Package.get('annakarenina').resources[0] cls.data = { 'resource_id': resource.id, - 'aliases': 'books2', + 'aliases': u'b\xfck2', 'fields': [{'id': 'book', 'type': 'text'}, - {'id': 'author', 'type': 'text'}], - 'records': [{'book': 'annakarenina', 'author': 'tolstoy'}, - {'book': 'warandpeace', 'author': 'tolstoy'}] + {'id': 'author', 'type': 'text'}, + {'id': 'rating with %', 'type': 'text'}], + 'records': [{'book': 'annakarenina', 'author': 'tolstoy', + 'rating with %': '90%'}, + {'book': 'warandpeace', 'author': 'tolstoy', + 'rating with %': '42%'}] } - engine = db._get_engine(None, + engine = db._get_engine( {'connection_url': pylons.config['ckan.datastore.write_url']}) cls.Session = orm.scoped_session(orm.sessionmaker(bind=engine)) @@ -72,14 +75,15 @@ def test_delete_basic(self): resource_id = self.data['resource_id'] c = self.Session.connection() - # alias should be deleted - results = c.execute("select 1 from pg_views where viewname = '{0}'".format(self.data['aliases'])) + # It's dangerous to build queries as someone could inject sql. + # It's okay here as it is a test but don't use it anyhwere else! + results = c.execute(u"select 1 from pg_views where viewname = '{0}'".format(self.data['aliases'])) assert results.rowcount == 0 try: # check that data was actually deleted: this should raise a # ProgrammingError as the table should not exist any more - c.execute('select * from "{0}";'.format(resource_id)) + c.execute(u'select * from "{0}";'.format(resource_id)) raise Exception("Data not deleted") except sqlalchemy.exc.ProgrammingError as e: expected_msg = 'relation "{0}" does not exist'.format(resource_id) @@ -110,7 +114,7 @@ def test_delete_filters(self): assert res_dict['success'] is True c = self.Session.connection() - result = c.execute('select * from "{0}";'.format(resource_id)) + result = c.execute(u'select * from "{0}";'.format(resource_id)) results = [r for r in result] assert len(results) == 1 assert results[0].book == 'annakarenina' @@ -127,7 +131,7 @@ def test_delete_filters(self): assert res_dict['success'] is True c = self.Session.connection() - result = c.execute('select * from "{0}";'.format(resource_id)) + result = c.execute(u'select * from "{0}";'.format(resource_id)) results = [r for r in result] assert len(results) == 1 assert results[0].book == 'annakarenina' @@ -144,7 +148,7 @@ def test_delete_filters(self): assert res_dict['success'] is True c = self.Session.connection() - result = c.execute('select * from "{0}";'.format(resource_id)) + result = c.execute(u'select * from "{0}";'.format(resource_id)) results = [r for r in result] assert len(results) == 0 self.Session.remove() diff --git a/ckanext/datastore/tests/test_dump.py b/ckanext/datastore/tests/test_dump.py index 8789fa9cea6..1a4ea3a7700 100644 --- a/ckanext/datastore/tests/test_dump.py +++ b/ckanext/datastore/tests/test_dump.py @@ -51,8 +51,8 @@ def setup_class(cls): assert res_dict['success'] is True import pylons - engine = db._get_engine(None, { - 'connection_url': pylons.config['ckan.datastore.write_url']}) + engine = db._get_engine( + {'connection_url': pylons.config['ckan.datastore.write_url']}) cls.Session = orm.scoped_session(orm.sessionmaker(bind=engine)) cls._original_config = config.copy() diff --git a/ckanext/datastore/tests/test_search.py b/ckanext/datastore/tests/test_search.py index e3923cf82d8..dbedd2b0a5b 100644 --- a/ckanext/datastore/tests/test_search.py +++ b/ckanext/datastore/tests/test_search.py @@ -34,12 +34,14 @@ def setup_class(cls): 'fields': [{'id': u'b\xfck', 'type': 'text'}, {'id': 'author', 'type': 'text'}, {'id': 'published'}, - {'id': u'characters', u'type': u'_text'}], + {'id': u'characters', u'type': u'_text'}, + {'id': 'rating with %'}], 'records': [{u'b\xfck': 'annakarenina', 'author': 'tolstoy', 'published': '2005-03-01', 'nested': ['b', {'moo': 'moo'}], - u'characters': [u'Princess Anna', u'Sergius']}, + u'characters': [u'Princess Anna', u'Sergius'], + 'rating with %': '60%'}, {u'b\xfck': 'warandpeace', 'author': 'tolstoy', - 'nested': {'a': 'b'}} + 'nested': {'a': 'b'}, 'rating with %': '99%'} ] } postparams = '%s=1' % json.dumps(cls.data) @@ -49,21 +51,28 @@ def setup_class(cls): res_dict = json.loads(res.body) assert res_dict['success'] is True + # Make an organization, because private datasets must belong to one. + cls.organization = tests.call_action_api( + cls.app, 'organization_create', + name='test_org', + apikey=cls.sysadmin_user.apikey) + cls.expected_records = [{u'published': u'2005-03-01T00:00:00', u'_id': 1, u'nested': [u'b', {u'moo': u'moo'}], u'b\xfck': u'annakarenina', u'author': u'tolstoy', - u'characters': [u'Princess Anna', u'Sergius']}, + u'characters': [u'Princess Anna', u'Sergius'], + u'rating with %': u'60%'}, {u'published': None, u'_id': 2, u'nested': {u'a': u'b'}, u'b\xfck': u'warandpeace', u'author': u'tolstoy', - u'characters': None}] + u'characters': None, + u'rating with %': u'99%'}] engine = db._get_engine( - None, {'connection_url': pylons.config['ckan.datastore.write_url']} ) cls.Session = orm.scoped_session(orm.sessionmaker(bind=engine)) @@ -101,11 +110,13 @@ def test_search_private_dataset(self): group = self.dataset.get_groups()[0] context = { 'user': self.sysadmin_user.name, + 'ignore_auth': True, 'model': model} package = p.toolkit.get_action('package_create')( context, {'name': 'privatedataset', 'private': True, + 'owner_org' : self.organization['id'], 'groups': [{ 'id': group.id }]}) @@ -342,9 +353,10 @@ def test_search_full_text(self): result = res_dict['result'] assert result['total'] == 1 - results = [extract(result['records'][0], - [u'_id', u'author', u'b\xfck', u'nested', u'published', u'characters'])] - assert results == [self.expected_records[0]], result['records'] + results = [extract(result['records'][0], [ + u'_id', u'author', u'b\xfck', u'nested', + u'published', u'characters', u'rating with %'])] + assert results == [self.expected_records[0]], results['records'] data = {'resource_id': self.data['resource_id'], 'q': 'tolstoy'} @@ -356,9 +368,10 @@ def test_search_full_text(self): result = res_dict['result'] assert result['total'] == 2 results = [extract( - record, - [u'_id', u'author', u'b\xfck', u'nested', u'published', u'characters'] - ) for record in result['records']] + record, + [u'_id', u'author', u'b\xfck', u'nested', + u'published', u'characters', u'rating with %'] + ) for record in result['records']] assert results == self.expected_records, result['records'] expected_fields = [{u'type': u'int4', u'id': u'_id'}, @@ -382,10 +395,10 @@ def test_search_full_text(self): result = res_dict['result'] assert result['total'] == 1 results = [extract( - result['records'][0], - [u'_id', u'author', u'b\xfck', u'nested', u'published', u'characters'] - )] - assert results == [self.expected_records[0]], result['records'] + result['records'][0], + [u'_id', u'author', u'b\xfck', u'nested', u'published', + u'characters', u'rating with %'])] + assert results == [self.expected_records[0]], results['records'] for field in expected_fields: assert field in result['fields'], field @@ -503,6 +516,12 @@ def setup_class(cls): extra_environ=auth) res_dict = json.loads(res.body) assert res_dict['success'] is True + + # Make an organization, because private datasets must belong to one. + cls.organization = tests.call_action_api( + cls.app, 'organization_create', + name='test_org', + apikey=cls.sysadmin_user.apikey) cls.expected_records = [{u'_full_text': u"'annakarenina':1 'b':3 'moo':4 'tolstoy':2", u'_id': 1, @@ -518,7 +537,7 @@ def setup_class(cls): u'published': None}] cls.expected_join_results = [{u'first': 1, u'second': 1}, {u'first': 1, u'second': 2}] - engine = db._get_engine(None, + engine = db._get_engine( {'connection_url': pylons.config['ckan.datastore.write_url']}) cls.Session = orm.scoped_session(orm.sessionmaker(bind=engine)) @@ -631,11 +650,13 @@ def test_new_datastore_table_from_private_resource(self): group = self.dataset.get_groups()[0] context = { 'user': self.sysadmin_user.name, + 'ignore_auth': True, 'model': model} package = p.toolkit.get_action('package_create')( context, {'name': 'privatedataset', 'private': True, + 'owner_org': self.organization['id'], 'groups': [{ 'id': group.id }]}) @@ -669,11 +690,13 @@ def test_making_resource_private_makes_datastore_private(self): group = self.dataset.get_groups()[0] context = { 'user': self.sysadmin_user.name, + 'ignore_auth': True, 'model': model} package = p.toolkit.get_action('package_create')( context, {'name': 'privatedataset2', 'private': False, + 'owner_org': self.organization['id'], 'groups': [{ 'id': group.id }]}) diff --git a/ckanext/datastore/tests/test_unit.py b/ckanext/datastore/tests/test_unit.py index 62e69c555a7..671812dd114 100644 --- a/ckanext/datastore/tests/test_unit.py +++ b/ckanext/datastore/tests/test_unit.py @@ -43,7 +43,7 @@ def test_is_valid_table_name(self): def test_pg_version_check(self): if not tests.is_datastore_supported(): raise nose.SkipTest("Datastore not supported") - engine = db._get_engine(None, + engine = db._get_engine( {'connection_url': pylons.config['sqlalchemy.url']}) connection = engine.connect() assert db._pg_version_is_at_least(connection, '8.0') diff --git a/ckanext/datastore/tests/test_upsert.py b/ckanext/datastore/tests/test_upsert.py index 5adffdca027..6db537415d5 100644 --- a/ckanext/datastore/tests/test_upsert.py +++ b/ckanext/datastore/tests/test_upsert.py @@ -48,7 +48,7 @@ def setup_class(cls): res_dict = json.loads(res.body) assert res_dict['success'] is True - engine = db._get_engine(None, + engine = db._get_engine( {'connection_url': pylons.config['ckan.datastore.write_url']}) cls.Session = orm.scoped_session(orm.sessionmaker(bind=engine)) @@ -271,7 +271,7 @@ def setup_class(cls): res_dict = json.loads(res.body) assert res_dict['success'] is True - engine = db._get_engine(None, + engine = db._get_engine( {'connection_url': pylons.config['ckan.datastore.write_url']}) cls.Session = orm.scoped_session(orm.sessionmaker(bind=engine)) @@ -375,7 +375,7 @@ def setup_class(cls): res_dict = json.loads(res.body) assert res_dict['success'] is True - engine = db._get_engine(None, + engine = db._get_engine( {'connection_url': pylons.config['ckan.datastore.write_url']}) cls.Session = orm.scoped_session(orm.sessionmaker(bind=engine)) diff --git a/ckanext/pdfpreview/plugin.py b/ckanext/pdfpreview/plugin.py index 69cfc2c1181..f6be15d708c 100644 --- a/ckanext/pdfpreview/plugin.py +++ b/ckanext/pdfpreview/plugin.py @@ -1,11 +1,9 @@ -from logging import getLogger +import logging import ckan.plugins as p -import ckan.lib.base as base -log = getLogger(__name__) +log = logging.getLogger(__name__) -proxy = False try: import ckanext.resourceproxy.plugin as proxy except ImportError: @@ -13,14 +11,7 @@ class PdfPreview(p.SingletonPlugin): - """This extension previews PDFs - - This extension implements two interfaces - - - ``IConfigurer`` allows to modify the configuration - - ``IConfigurable`` get the configuration - - ``IResourcePreview`` allows to add previews - """ + '''This extension previews PDFs. ''' p.implements(p.IConfigurer, inherit=True) p.implements(p.IConfigurable, inherit=True) p.implements(p.IResourcePreview, inherit=True) @@ -29,24 +20,31 @@ class PdfPreview(p.SingletonPlugin): proxy_is_enabled = False def update_config(self, config): - ''' Set up the resource library, public directory and - template directory for the preview - ''' p.toolkit.add_public_directory(config, 'theme/public') p.toolkit.add_template_directory(config, 'theme/templates') p.toolkit.add_resource('theme/public', 'ckanext-pdfpreview') def configure(self, config): - self.proxy_is_enabled = config.get('ckan.resource_proxy_enabled', False) + enabled = config.get('ckan.resource_proxy_enabled', False) + self.proxy_is_enabled = enabled def can_preview(self, data_dict): resource = data_dict['resource'] format_lower = resource['format'].lower() - return format_lower in self.PDF and (resource['on_same_domain'] or self.proxy_is_enabled) + if format_lower in self.PDF: + if resource['on_same_domain'] or self.proxy_is_enabled: + return {'can_preview': True, 'quality': 2} + else: + return {'can_preview': False, + 'fixable': 'Enable resource_proxy', + 'quality': 2} + return {'can_preview': False} def setup_template_variables(self, context, data_dict): - if self.proxy_is_enabled and not data_dict['resource']['on_same_domain']: - base.c.resource['url'] = proxy.get_proxified_resource_url(data_dict) + if (self.proxy_is_enabled + and not data_dict['resource']['on_same_domain']): + url = proxy.get_proxified_resource_url(data_dict) + p.toolkit.c.resource['url'] = url def preview_template(self, context, data_dict): return 'pdf.html' diff --git a/ckanext/pdfpreview/tests/test_preview.py b/ckanext/pdfpreview/tests/test_preview.py index fb6aa643332..9a8326ac78f 100644 --- a/ckanext/pdfpreview/tests/test_preview.py +++ b/ckanext/pdfpreview/tests/test_preview.py @@ -54,7 +54,7 @@ def test_can_preview(self): 'on_same_domain': True } } - assert self.p.can_preview(data_dict) + assert self.p.can_preview(data_dict)['can_preview'] data_dict = { 'resource': { @@ -62,7 +62,7 @@ def test_can_preview(self): 'on_same_domain': True } } - assert self.p.can_preview(data_dict) + assert self.p.can_preview(data_dict)['can_preview'] data_dict = { 'resource': { @@ -70,7 +70,7 @@ def test_can_preview(self): 'on_same_domain': True } } - assert self.p.can_preview(data_dict) + assert self.p.can_preview(data_dict)['can_preview'] data_dict = { 'resource': { @@ -78,7 +78,7 @@ def test_can_preview(self): 'on_same_domain': False } } - assert not self.p.can_preview(data_dict) + assert not self.p.can_preview(data_dict)['can_preview'] def test_js_included(self): res_id = self.resource['id'] diff --git a/ckanext/resourceproxy/controller.py b/ckanext/resourceproxy/controller.py index 1bc059eb711..81a8123e3b1 100644 --- a/ckanext/resourceproxy/controller.py +++ b/ckanext/resourceproxy/controller.py @@ -27,7 +27,7 @@ def proxy_resource(context, data_dict): did_get = False r = requests.head(url) if r.status_code == 405: - r = requests.get(url) + r = requests.get(url, stream=True) did_get = True r.raise_for_status() @@ -38,14 +38,13 @@ def proxy_resource(context, data_dict): allowed=MAX_FILE_SIZE, actual=cl)) if not did_get: - r = requests.get(url) + r = requests.get(url, stream=True) base.response.content_type = r.headers['content-type'] base.response.charset = r.encoding length = 0 - for chunk in r.iter_content(chunk_size=CHUNK_SIZE, - decode_unicode=False): + for chunk in r.iter_content(chunk_size=CHUNK_SIZE): base.response.body_file.write(chunk) length += len(chunk) diff --git a/ckanext/textpreview/plugin.py b/ckanext/textpreview/plugin.py index 6ae0a2d5cbb..e43530d61b9 100644 --- a/ckanext/textpreview/plugin.py +++ b/ckanext/textpreview/plugin.py @@ -1,12 +1,11 @@ -from logging import getLogger +import logging import ckan.plugins as p from ckan.common import json -log = getLogger(__name__) +log = logging.getLogger(__name__) -proxy = False try: import ckanext.resourceproxy.plugin as proxy except ImportError: @@ -18,16 +17,17 @@ DEFAULT_JSON_FORMATS = ['json', 'gjson', 'geojson'] DEFAULT_JSONP_FORMATS = ['jsonp'] +# returned preview quality will be one but can be overridden here +QUALITY = { + 'text/plain': 2, + 'txt': 2, + 'plain': 2, +} -class TextPreview(p.SingletonPlugin): - """This extension previews JSON(P) - This extension implements two interfaces +class TextPreview(p.SingletonPlugin): + '''This extension previews JSON(P).''' - - ``IConfigurer`` allows to modify the configuration - - ``IConfigurable`` get the configuration - - ``IResourcePreview`` allows to add previews - """ p.implements(p.IConfigurer, inherit=True) p.implements(p.IConfigurable, inherit=True) p.implements(p.IResourcePreview, inherit=True) @@ -35,29 +35,17 @@ class TextPreview(p.SingletonPlugin): proxy_is_enabled = False def update_config(self, config): - ''' Set up the resource library, public directory and - template directory for the preview - ''' - - self.text_formats = config.get( - 'ckan.preview.text_formats', '').split() - if not self.text_formats: - self.text_formats = DEFAULT_TEXT_FORMATS - - self.xml_formats = config.get( - 'ckan.preview.xml_formats', '').split() - if not self.xml_formats: - self.xml_formats = DEFAULT_XML_FORMATS - - self.json_formats = config.get( - 'ckan.preview.json_formats', '').split() - if not self.json_formats: - self.json_formats = DEFAULT_JSON_FORMATS - - self.jsonp_formats = config.get( - 'ckan.preview.jsonp_formats', '').split() - if not self.jsonp_formats: - self.jsonp_formats = DEFAULT_JSONP_FORMATS + text_formats = config.get('ckan.preview.text_formats', '').split() + self.text_formats = text_formats or DEFAULT_TEXT_FORMATS + + xml_formats = config.get('ckan.preview.xml_formats', '').split() + self.xml_formats = xml_formats or DEFAULT_XML_FORMATS + + json_formats = config.get('ckan.preview.json_formats', '').split() + self.json_formats = json_formats or DEFAULT_JSON_FORMATS + + jsonp_formats = config.get('ckan.preview.jsonp_formats', '').split() + self.jsonp_formats = jsonp_formats or DEFAULT_JSONP_FORMATS self.no_jsonp_formats = (self.text_formats + self.xml_formats + @@ -68,18 +56,24 @@ def update_config(self, config): p.toolkit.add_resource('theme/public', 'ckanext-textpreview') def configure(self, config): - self.proxy_is_enabled = config.get( - 'ckan.resource_proxy_enabled', False) + self.proxy_is_enabled = config.get('ckan.resource_proxy_enabled') def can_preview(self, data_dict): resource = data_dict['resource'] format_lower = resource['format'].lower() + + quality = QUALITY.get(format_lower, 1) + if format_lower in self.jsonp_formats: - return True - elif format_lower in self.no_jsonp_formats and ( - self.proxy_is_enabled or resource['on_same_domain']): - return True - return False + return {'can_preview': True, 'quality': quality} + elif format_lower in self.no_jsonp_formats: + if self.proxy_is_enabled or resource['on_same_domain']: + return {'can_preview': True, 'quality': quality} + else: + return {'can_preview': False, + 'fixable': 'Enable resource_proxy', + 'quality': quality} + return {'can_preview': False} def setup_template_variables(self, context, data_dict): assert self.can_preview(data_dict) @@ -93,8 +87,8 @@ def setup_template_variables(self, context, data_dict): format_lower = resource['format'].lower() if (format_lower in self.no_jsonp_formats and self.proxy_is_enabled and not resource['on_same_domain']): - p.toolkit.c.resource['url'] = proxy.get_proxified_resource_url( - data_dict) + url = proxy.get_proxified_resource_url(data_dict) + p.toolkit.c.resource['url'] = url def preview_template(self, context, data_dict): return 'text.html' diff --git a/ckanext/textpreview/tests/test_preview.py b/ckanext/textpreview/tests/test_preview.py index 2c3ba26f52c..4b6079f0b12 100644 --- a/ckanext/textpreview/tests/test_preview.py +++ b/ckanext/textpreview/tests/test_preview.py @@ -53,7 +53,7 @@ def test_can_preview(self): 'format': 'jsonp' } } - assert self.p.can_preview(data_dict) + assert self.p.can_preview(data_dict)['can_preview'] data_dict = { 'resource': { @@ -61,7 +61,7 @@ def test_can_preview(self): 'on_same_domain': True } } - assert self.p.can_preview(data_dict) + assert self.p.can_preview(data_dict)['can_preview'] data_dict = { 'resource': { @@ -69,7 +69,7 @@ def test_can_preview(self): 'on_same_domain': True } } - assert self.p.can_preview(data_dict) + assert self.p.can_preview(data_dict)['can_preview'] data_dict = { 'resource': { @@ -77,7 +77,7 @@ def test_can_preview(self): 'on_same_domain': True } } - assert self.p.can_preview(data_dict) + assert self.p.can_preview(data_dict)['can_preview'] data_dict = { 'resource': { @@ -85,7 +85,7 @@ def test_can_preview(self): 'on_same_domain': True } } - assert not self.p.can_preview(data_dict) + assert not self.p.can_preview(data_dict)['can_preview'] data_dict = { 'resource': { @@ -93,7 +93,7 @@ def test_can_preview(self): 'on_same_domain': False } } - assert not self.p.can_preview(data_dict) + assert not self.p.can_preview(data_dict)['can_preview'] def test_js_included(self): res_id = self.resource['id'] diff --git a/dev-requirements.txt b/dev-requirements.txt index 88e4bf73a46..41611c81aec 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -3,7 +3,7 @@ docutils==0.8.1 httpretty==0.6.0 nose==1.2.1 -pep8==1.3.3 +pep8==1.4.5 pip-tools==0.3.1 Sphinx==1.2b1 polib==1.0.3 diff --git a/doc/changelog.rst b/doc/changelog.rst deleted file mode 120000 index e22698baf7c..00000000000 --- a/doc/changelog.rst +++ /dev/null @@ -1 +0,0 @@ -../CHANGELOG.rst \ No newline at end of file