diff --git a/blocks/block.block.olivesnews_creatorsandcontributors.yml b/blocks/block.block.olivesnews_creatorsandcontributors.yml deleted file mode 100755 index fdb57df..0000000 --- a/blocks/block.block.olivesnews_creatorsandcontributors.yml +++ /dev/null @@ -1,42 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - facets.facet.creators_and_contributors - module: - - context - - facets - theme: - - olivesnews -_core: - default_config_hash: jziE1LayhQhICzoN5LBg3jdBwNieZWUHHr4xGAlwj_o -id: olivesnews_creatorsandcontributors -theme: olivesnews -region: sidebar -weight: -13 -provider: null -plugin: 'facet_block:creators_and_contributors' -settings: - id: 'facet_block:creators_and_contributors' - label: 'Creators and Contributors' - label_display: visible - provider: facets - context_mapping: { } - block_id: creatorsandcontributors -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - view_inclusion: - id: view_inclusion - negate: false - view_inclusion: - view-solr_search_content-page_1: view-solr_search_content-page_1 diff --git a/blocks/block.block.olivesnews_creatorsandcontributors_swc.yml b/blocks/block.block.olivesnews_creatorsandcontributors_swc.yml deleted file mode 100755 index ef63236..0000000 --- a/blocks/block.block.olivesnews_creatorsandcontributors_swc.yml +++ /dev/null @@ -1,39 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - facets.facet.creators_and_contributors_swc - module: - - context - - facets - theme: - - olivesnews -id: olivesnews_creatorsandcontributors_swc -theme: olivesnews -region: sidebar -weight: -12 -provider: null -plugin: 'facet_block:creators_and_contributors_swc' -settings: - id: 'facet_block:creators_and_contributors_swc' - label: 'Creators and Contributors' - label_display: visible - provider: facets - context_mapping: { } - block_id: creatorsandcontributors_swc -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - context_all: - id: context_all - negate: null - values: collection diff --git a/blocks/block.block.olivesnews_genre.yml b/blocks/block.block.olivesnews_genre.yml deleted file mode 100755 index c9080f0..0000000 --- a/blocks/block.block.olivesnews_genre.yml +++ /dev/null @@ -1,23 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - facets.facet.genre - module: - - facets - theme: - - olivesnews -id: olivesnews_genre -theme: olivesnews -region: sidebar -weight: -18 -provider: null -plugin: 'facet_block:genre' -settings: - id: 'facet_block:genre' - label: Genre - label_display: visible - provider: facets - context_mapping: { } - block_id: olivesnews_genre -visibility: { } diff --git a/blocks/block.block.olivesnews_genreswc.yml b/blocks/block.block.olivesnews_genreswc.yml deleted file mode 100755 index 74c3e8c..0000000 --- a/blocks/block.block.olivesnews_genreswc.yml +++ /dev/null @@ -1,28 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - facets.facet.duplicate_of_genre - module: - - context - - facets - theme: - - olivesnews -id: olivesnews_genreswc -theme: olivesnews -region: sidebar -weight: -17 -provider: null -plugin: 'facet_block:duplicate_of_genre' -settings: - id: 'facet_block:duplicate_of_genre' - label: Genre - label_display: visible - provider: facets - context_mapping: { } - block_id: olivesnews_genreswc -visibility: - context_all: - id: context_all - negate: false - values: collection diff --git a/blocks/block.block.olivesnews_geographiccityswc.yml b/blocks/block.block.olivesnews_geographiccityswc.yml deleted file mode 100755 index 15327bd..0000000 --- a/blocks/block.block.olivesnews_geographiccityswc.yml +++ /dev/null @@ -1,28 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - facets.facet.geographic_city_swc - module: - - context - - facets - theme: - - olivesnews -id: olivesnews_geographiccityswc -theme: olivesnews -region: sidebar -weight: -16 -provider: null -plugin: 'facet_block:geographic_city_swc' -settings: - id: 'facet_block:geographic_city_swc' - label: City - label_display: visible - provider: facets - context_mapping: { } - block_id: olivesnews_geographiccityswc -visibility: - context_all: - id: context_all - negate: false - values: collection diff --git a/blocks/block.block.olivesnews_ia2searchdisclaimer.yml b/blocks/block.block.olivesnews_ia2searchdisclaimer.yml deleted file mode 100755 index d47a41f..0000000 --- a/blocks/block.block.olivesnews_ia2searchdisclaimer.yml +++ /dev/null @@ -1,29 +0,0 @@ -langcode: en -status: true -dependencies: - content: - - 'block_content:basic:5eb4ec6d-9271-4242-84ec-9060fba79b5c' - module: - - block_content - - system - theme: - - olivesnews -id: olivesnews_ia2searchdisclaimer -theme: olivesnews -region: content_above -weight: 0 -provider: null -plugin: 'block_content:5eb4ec6d-9271-4242-84ec-9060fba79b5c' -settings: - id: 'block_content:5eb4ec6d-9271-4242-84ec-9060fba79b5c' - label: 'IA2 search disclaimer' - label_display: '0' - provider: block_content - status: true - info: '' - view_mode: full -visibility: - request_path: - id: request_path - negate: false - pages: /search diff --git a/blocks/block.block.olivesnews_islandarchivescollectionname.yml b/blocks/block.block.olivesnews_islandarchivescollectionname.yml deleted file mode 100755 index 8e28fb4..0000000 --- a/blocks/block.block.olivesnews_islandarchivescollectionname.yml +++ /dev/null @@ -1,29 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - facets.facet.island_archives_collection_name - module: - - context - - facets - theme: - - olivesnews -id: olivesnews_islandarchivescollectionname -theme: olivesnews -region: sidebar -weight: 0 -provider: null -plugin: 'facet_block:island_archives_collection_name' -settings: - id: 'facet_block:island_archives_collection_name' - label: Collection - label_display: visible - provider: facets - context_mapping: { } - block_id: olivesnews_islandarchivescollectionname -visibility: - view_inclusion: - id: view_inclusion - negate: false - view_inclusion: - view-solr_search_content-page_1: view-solr_search_content-page_1 diff --git a/blocks/block.block.olivesnews_memberof.yml b/blocks/block.block.olivesnews_memberof.yml deleted file mode 100755 index e24ad5c..0000000 --- a/blocks/block.block.olivesnews_memberof.yml +++ /dev/null @@ -1,40 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - facets.facet.member_of - module: - - context - - facets - theme: - - olivesnews -id: olivesnews_memberof -theme: olivesnews -region: sidebar -weight: -11 -provider: null -plugin: 'facet_block:member_of' -settings: - id: 'facet_block:member_of' - label: 'Member of' - label_display: visible - provider: facets - context_mapping: { } - block_id: memberof -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - view_inclusion: - id: view_inclusion - negate: false - view_inclusion: - view-solr_search_content-page_1: view-solr_search_content-page_1 diff --git a/blocks/block.block.olivesnews_memberofswc.yml b/blocks/block.block.olivesnews_memberofswc.yml deleted file mode 100755 index 245e0bc..0000000 --- a/blocks/block.block.olivesnews_memberofswc.yml +++ /dev/null @@ -1,39 +0,0 @@ -langcode: en -status: false -dependencies: - config: - - facets.facet.member_of_swc - module: - - context - - facets - theme: - - olivesnews -id: olivesnews_memberofswc -theme: olivesnews -region: sidebar -weight: -2 -provider: null -plugin: 'facet_block:member_of_swc' -settings: - id: 'facet_block:member_of_swc' - label: 'Member Of' - label_display: visible - provider: facets - context_mapping: { } - block_id: memberofswc -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - context_all: - id: context_all - negate: null - values: collection diff --git a/blocks/block.block.olivesnews_physicalformswc.yml b/blocks/block.block.olivesnews_physicalformswc.yml deleted file mode 100755 index 3802228..0000000 --- a/blocks/block.block.olivesnews_physicalformswc.yml +++ /dev/null @@ -1,39 +0,0 @@ -langcode: en -status: false -dependencies: - config: - - facets.facet.physical_form_swc - module: - - context - - facets - theme: - - olivesnews -id: olivesnews_physicalformswc -theme: olivesnews -region: sidebar -weight: -1 -provider: null -plugin: 'facet_block:physical_form_swc' -settings: - id: 'facet_block:physical_form_swc' - label: 'Physical Form' - label_display: visible - provider: facets - context_mapping: { } - block_id: physicalformswc -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - context_all: - id: context_all - negate: null - values: collection diff --git a/blocks/block.block.olivesnews_resource_type_swc.yml b/blocks/block.block.olivesnews_resource_type_swc.yml deleted file mode 100755 index 05c71a8..0000000 --- a/blocks/block.block.olivesnews_resource_type_swc.yml +++ /dev/null @@ -1,39 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - facets.facet.resource_type_swc - module: - - context - - facets - theme: - - olivesnews -id: olivesnews_resource_type_swc -theme: olivesnews -region: sidebar -weight: -3 -provider: null -plugin: 'facet_block:resource_type_swc' -settings: - id: 'facet_block:resource_type_swc' - label: 'Resource Type' - label_display: visible - provider: facets - context_mapping: { } - block_id: resource_type_swc -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - context_all: - id: context_all - negate: null - values: collection diff --git a/blocks/block.block.olivesnews_resourcetype.yml b/blocks/block.block.olivesnews_resourcetype.yml deleted file mode 100755 index c8d8985..0000000 --- a/blocks/block.block.olivesnews_resourcetype.yml +++ /dev/null @@ -1,29 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - facets.facet.resource_type - module: - - context - - facets - theme: - - olivesnews -id: olivesnews_resourcetype -theme: olivesnews -region: sidebar -weight: -4 -provider: null -plugin: 'facet_block:resource_type' -settings: - id: 'facet_block:resource_type' - label: 'Resource Type' - label_display: visible - provider: facets - context_mapping: { } - block_id: olivesnews_resourcetype -visibility: - view_inclusion: - id: view_inclusion - negate: false - view_inclusion: - view-solr_search_content-page_1: view-solr_search_content-page_1 diff --git a/blocks/block.block.olivesnews_solrsearchcontentadvancedsearchforblock.yml b/blocks/block.block.olivesnews_solrsearchcontentadvancedsearchforblock.yml deleted file mode 100755 index 550a8c7..0000000 --- a/blocks/block.block.olivesnews_solrsearchcontentadvancedsearchforblock.yml +++ /dev/null @@ -1,40 +0,0 @@ -langcode: en -status: true -dependencies: - module: - - advanced_search - - context - theme: - - olivesnews -id: olivesnews_solrsearchcontentadvancedsearchforblock -theme: olivesnews -region: sidebar -weight: -19 -provider: null -plugin: 'advanced_search_block:solr_search_content__block_1' -settings: - id: 'advanced_search_block:solr_search_content__block_1' - label: 'Search within Collection' - label_display: visible - provider: advanced_search - fields: - - title_aggregated_fulltext - - abstract_description_fulltext - - linked_agent_name_fulltext - context_filter: field_member_of -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - context_all: - id: context_all - negate: null - values: collection diff --git a/blocks/block.block.olivesnews_solrsearchcontentadvancedsearchforpage.yml b/blocks/block.block.olivesnews_solrsearchcontentadvancedsearchforpage.yml deleted file mode 100755 index a2cb791..0000000 --- a/blocks/block.block.olivesnews_solrsearchcontentadvancedsearchforpage.yml +++ /dev/null @@ -1,31 +0,0 @@ -langcode: en -status: true -dependencies: - module: - - advanced_search - - context - theme: - - olivesnews -id: olivesnews_solrsearchcontentadvancedsearchforpage -theme: olivesnews -region: sidebar -weight: -20 -provider: null -plugin: 'advanced_search_block:solr_search_content__page_1' -settings: - id: 'advanced_search_block:solr_search_content__page_1' - label: Search - label_display: visible - provider: advanced_search - fields: - - title_aggregated_fulltext - - abstract_description_fulltext - - linked_agent_name_fulltext - - field_publisher_1 - context_filter: null -visibility: - view_inclusion: - id: view_inclusion - negate: false - view_inclusion: - view-solr_search_content-page_1: view-solr_search_content-page_1 diff --git a/blocks/block.block.olivesnews_solrsearchcontentsearchresultspagerforblock.yml b/blocks/block.block.olivesnews_solrsearchcontentsearchresultspagerforblock.yml deleted file mode 100755 index 34fb6ee..0000000 --- a/blocks/block.block.olivesnews_solrsearchcontentsearchresultspagerforblock.yml +++ /dev/null @@ -1,35 +0,0 @@ -langcode: en -status: true -dependencies: - module: - - advanced_search - - context - theme: - - olivesnews -id: olivesnews_solrsearchcontentsearchresultspagerforblock -theme: olivesnews -region: content -weight: -18 -provider: null -plugin: 'advanced_search_result_pager:solr_search_content__block_1' -settings: - id: 'advanced_search_result_pager:solr_search_content__block_1' - label: 'Solr search content: Search Results Pager for Block' - label_display: '0' - provider: advanced_search -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - context_all: - id: context_all - negate: null - values: collection diff --git a/blocks/block.block.olivesnews_solrsearchcontentsearchresultspagerforpage.yml b/blocks/block.block.olivesnews_solrsearchcontentsearchresultspagerforpage.yml deleted file mode 100755 index 1f0fcd4..0000000 --- a/blocks/block.block.olivesnews_solrsearchcontentsearchresultspagerforpage.yml +++ /dev/null @@ -1,36 +0,0 @@ -langcode: en -status: true -dependencies: - module: - - advanced_search - - context - theme: - - olivesnews -id: olivesnews_solrsearchcontentsearchresultspagerforpage -theme: olivesnews -region: content -weight: -19 -provider: null -plugin: 'advanced_search_result_pager:solr_search_content__page_1' -settings: - id: 'advanced_search_result_pager:solr_search_content__page_1' - label: 'Solr search content: Search Results Pager for Page' - label_display: '0' - provider: advanced_search -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - view_inclusion: - id: view_inclusion - negate: false - view_inclusion: - view-solr_search_content-page_1: view-solr_search_content-page_1 diff --git a/blocks/block.block.olivesnews_subject.yml b/blocks/block.block.olivesnews_subject.yml deleted file mode 100755 index f4977bf..0000000 --- a/blocks/block.block.olivesnews_subject.yml +++ /dev/null @@ -1,42 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - facets.facet.subject - module: - - context - - facets - theme: - - olivesnews -_core: - default_config_hash: 8CNTurKBSOQZRTrWiaCmfAwseQyzXZOb8gJohUvIBFw -id: olivesnews_subject -theme: olivesnews -region: sidebar -weight: -10 -provider: null -plugin: 'facet_block:subject' -settings: - id: 'facet_block:subject' - label: Subject - label_display: visible - provider: facets - context_mapping: { } - block_id: subject -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - view_inclusion: - id: view_inclusion - negate: false - view_inclusion: - view-solr_search_content-page_1: view-solr_search_content-page_1 diff --git a/blocks/block.block.olivesnews_subjectname.yml b/blocks/block.block.olivesnews_subjectname.yml deleted file mode 100755 index ab5c4aa..0000000 --- a/blocks/block.block.olivesnews_subjectname.yml +++ /dev/null @@ -1,42 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - facets.facet.subject_name - module: - - context - - facets - theme: - - olivesnews -_core: - default_config_hash: VFNCtt7POqemCYyZ3x3gWDwdyJfoAmbqHim37oy6onU -id: olivesnews_subjectname -theme: olivesnews -region: sidebar -weight: -8 -provider: null -plugin: 'facet_block:subject_name' -settings: - id: 'facet_block:subject_name' - label: 'Subject (name)' - label_display: visible - provider: facets - context_mapping: { } - block_id: subjectname -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - view_inclusion: - id: view_inclusion - negate: false - view_inclusion: - view-solr_search_content-page_1: view-solr_search_content-page_1 diff --git a/blocks/block.block.olivesnews_subjectnamesswc.yml b/blocks/block.block.olivesnews_subjectnamesswc.yml deleted file mode 100755 index 2c1e25e..0000000 --- a/blocks/block.block.olivesnews_subjectnamesswc.yml +++ /dev/null @@ -1,39 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - facets.facet.subject_names_swc - module: - - context - - facets - theme: - - olivesnews -id: olivesnews_subjectnamesswc -theme: olivesnews -region: sidebar -weight: -7 -provider: null -plugin: 'facet_block:subject_names_swc' -settings: - id: 'facet_block:subject_names_swc' - label: 'Subject (name)' - label_display: visible - provider: facets - context_mapping: { } - block_id: subjectnamesswc -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - context_all: - id: context_all - negate: null - values: collection diff --git a/blocks/block.block.olivesnews_subjectsswc.yml b/blocks/block.block.olivesnews_subjectsswc.yml deleted file mode 100755 index 6d2975c..0000000 --- a/blocks/block.block.olivesnews_subjectsswc.yml +++ /dev/null @@ -1,39 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - facets.facet.subjects - module: - - context - - facets - theme: - - olivesnews -id: olivesnews_subjectsswc -theme: olivesnews -region: sidebar -weight: -9 -provider: null -plugin: 'facet_block:subjects' -settings: - id: 'facet_block:subjects' - label: Subject - label_display: visible - provider: facets - context_mapping: { } - block_id: subjectsswc -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - context_all: - id: context_all - negate: null - values: collection diff --git a/blocks/block.block.olivesnews_subjecttemporalswc.yml b/blocks/block.block.olivesnews_subjecttemporalswc.yml deleted file mode 100755 index 454ff2e..0000000 --- a/blocks/block.block.olivesnews_subjecttemporalswc.yml +++ /dev/null @@ -1,39 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - facets.facet.subject_temporal_swc - module: - - context - - facets - theme: - - olivesnews -id: olivesnews_subjecttemporalswc -theme: olivesnews -region: sidebar -weight: -5 -provider: null -plugin: 'facet_block:subject_temporal_swc' -settings: - id: 'facet_block:subject_temporal_swc' - label: 'Temporal Subject' - label_display: visible - provider: facets - context_mapping: { } - block_id: subjecttemporalswc -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - context_all: - id: context_all - negate: null - values: collection diff --git a/blocks/block.block.olivesnews_temporalsubject.yml b/blocks/block.block.olivesnews_temporalsubject.yml deleted file mode 100755 index decd147..0000000 --- a/blocks/block.block.olivesnews_temporalsubject.yml +++ /dev/null @@ -1,42 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - facets.facet.temporal_subject - module: - - context - - facets - theme: - - olivesnews -_core: - default_config_hash: 1BMA18tJL_4xlrR2wg5QSmr499p157HBiWAgv_rJmQ4 -id: olivesnews_temporalsubject -theme: olivesnews -region: sidebar -weight: -6 -provider: null -plugin: 'facet_block:temporal_subject' -settings: - id: 'facet_block:temporal_subject' - label: 'Temporal Subject' - label_display: visible - provider: facets - context_mapping: { } - block_id: temporalsubject -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - view_inclusion: - id: view_inclusion - negate: false - view_inclusion: - view-solr_search_content-page_1: view-solr_search_content-page_1 diff --git a/blocks/block.block.olivesnews_views_block__solr_search_content_block_1.yml b/blocks/block.block.olivesnews_views_block__solr_search_content_block_1.yml deleted file mode 100755 index f601fb1..0000000 --- a/blocks/block.block.olivesnews_views_block__solr_search_content_block_1.yml +++ /dev/null @@ -1,39 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - views.view.solr_search_content - module: - - context - - views - theme: - - olivesnews -id: olivesnews_views_block__solr_search_content_block_1 -theme: olivesnews -region: content -weight: -16 -provider: null -plugin: 'views_block:solr_search_content-block_1' -settings: - id: 'views_block:solr_search_content-block_1' - label: '' - label_display: '0' - provider: views - views_label: '' - items_per_page: none -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - context_all: - id: context_all - negate: null - values: collection diff --git a/blocks/block.block.olivesnews_year.yml b/blocks/block.block.olivesnews_year.yml deleted file mode 100755 index d23e37b..0000000 --- a/blocks/block.block.olivesnews_year.yml +++ /dev/null @@ -1,40 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - facets.facet.year - module: - - context - - facets - theme: - - olivesnews -id: olivesnews_year -theme: olivesnews -region: sidebar -weight: -15 -provider: null -plugin: 'facet_block:year' -settings: - id: 'facet_block:year' - label: Year - label_display: visible - provider: facets - context_mapping: { } - block_id: year -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - view_inclusion: - id: view_inclusion - negate: false - view_inclusion: - view-solr_search_content-page_1: view-solr_search_content-page_1 diff --git a/blocks/block.block.olivesnews_yearswc.yml b/blocks/block.block.olivesnews_yearswc.yml deleted file mode 100755 index 1cca710..0000000 --- a/blocks/block.block.olivesnews_yearswc.yml +++ /dev/null @@ -1,39 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - facets.facet.year_swc - module: - - context - - facets - theme: - - olivesnews -id: olivesnews_yearswc -theme: olivesnews -region: sidebar -weight: -14 -provider: null -plugin: 'facet_block:year_swc' -settings: - id: 'facet_block:year_swc' - label: Year - label_display: visible - provider: facets - context_mapping: { } - block_id: yearswc -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - context_all: - id: context_all - negate: null - values: collection diff --git a/css/base/fonts.css b/css/base/fonts.css index 9bcfb2b..597f327 100755 --- a/css/base/fonts.css +++ b/css/base/fonts.css @@ -1,46 +1,31 @@ -/* - * DO NOT EDIT THIS FILE. - * See the following change record for more information, - * https://www.drupal.org/node/3084859 - * @preserve - */ - -/** - * @file - * Base Fonts. - */ @font-face { - font-family: 'Libre Bodoni'; - src: url('../../fonts/LibreBodoni-Bold.woff2') format('woff2'), - url('../../fonts/LibreBodoni-Bold.woff') format('woff'); - font-weight: bold; - font-style: normal; - font-display: swap; + font-family: "Manufacturing Consent"; + src: url("../fonts/Manufacturing_Consent/ManufacturingConsent-Regular.woff2") format("woff2"); + font-weight: 400 700; + font-style: normal; + font-display: swap; } - @font-face { - font-family: 'Libre Bodoni'; - src: url('../../fonts/LibreBodoni-Italic.woff2') format('woff2'), - url('../../fonts/LibreBodoni-Italic.woff') format('woff'); - font-weight: normal; - font-style: italic; - font-display: swap; + font-family: "Libre Baskerville"; + src: url("../fonts/Libre_Baskerville/LibreBaskerville-VariableFont_wght.woff2") format("woff2"); + font-weight: 400 700; + font-style: normal; + font-display: swap; } @font-face { - font-family: 'Libre Bodoni'; - src: url('../../fonts/LibreBodoni-Regular.woff2') format('woff2'), - url('../../fonts/LibreBodoni-Regular.woff') format('woff'); - font-weight: normal; - font-style: normal; - font-display: swap; + font-family: "Libre Baskerville"; + src: url("../fonts/Libre_Baskerville/LibreBaskerville-Italic-VariableFont_wght.woff2") format("woff2"); + font-weight: 400 700; + font-style: italic; + font-display: swap; } @font-face { font-family: 'Source Sans 3'; - src: url('../../fonts/SourceSans3-Bold.woff2') format('woff2'), - url('../../fonts/SourceSans3-Bold.woff') format('woff'); + src: url('../../fonts/SourceSans3/SourceSans3-Bold.woff2') format('woff2'), + url('../../fonts/SourceSans3/SourceSans3-Bold.woff') format('woff'); font-weight: bold; font-style: normal; font-display: swap; @@ -48,8 +33,8 @@ @font-face { font-family: 'Source Sans 3'; - src: url('../../fonts/SourceSans3-Regular.woff2') format('woff2'), - url('../../fonts/SourceSans3-Regular.woff') format('woff'); + src: url('../../fonts/SourceSans3/SourceSans3-Regular.woff2') format('woff2'), + url('../../fonts/SourceSans3/SourceSans3-Regular.woff') format('woff'); font-weight: normal; font-style: normal; font-display: swap; @@ -57,67 +42,10 @@ @font-face { font-family: 'Source Sans 3'; - src: url('../../fonts/SourceSans3-Italic.woff2') format('woff2'), - url('../../fonts/SourceSans3-Italic.woff') format('woff'); + src: url('../../fonts/SourceSans3/SourceSans3-Italic.woff2') format('woff2'), + url('../../fonts/SourceSans3/SourceSans3-Italic.woff') format('woff'); font-weight: normal; font-style: italic; font-display: swap; } -/* - *old stuff - */ - -@font-face { - font-family: metropolis; - src: url("../../fonts/metropolis/Metropolis-Regular.woff2") format("woff2"); - font-weight: normal; - font-style: normal; - font-display: swap; -} - -@font-face { - font-family: metropolis; - src: url("../../fonts/metropolis/Metropolis-Bold.woff2") format("woff2"); - font-weight: 700; - font-style: normal; - font-display: swap; -} - -@font-face { - font-family: metropolis; - src: url("../../fonts/metropolis/Metropolis-SemiBold.woff2") format("woff2"); - font-weight: 600; - font-style: normal; - font-display: swap; -} - -/* lora-regular - latin */ - -@font-face { - font-family: Lora; - src: local("Lora Regular"), local("Lora-Regular"), url("../../fonts/lora/lora-v14-latin-regular.woff2") format("woff2"); - font-weight: 400; - font-style: normal; - font-display: swap; -} - -/* lora-italic - latin */ - -@font-face { - font-family: Lora; - src: local("Lora Italic"), local("Lora-Italic"), url("../../fonts/lora/lora-v14-latin-italic.woff2") format("woff2"); - font-weight: 400; - font-style: italic; - font-display: swap; -} - -/* lora-700 - latin */ - -@font-face { - font-family: Lora; - src: local("Lora Bold"), local("Lora-Bold"), url("../../fonts/lora/lora-v14-latin-700.woff2") format("woff2"); - font-weight: 700; - font-style: normal; - font-display: swap; -} diff --git a/css/base/variables.css b/css/base/variables.css index afb3aed..3410b20 100755 --- a/css/base/variables.css +++ b/css/base/variables.css @@ -13,9 +13,10 @@ :root { /*--font-sans: "metropolis", sans-serif;*/ - --font-sans: "metropolis", sans-serif; + --font-sans: "Source Sans 3", sans-serif; /*--font-serif: "Lora", "georgia", serif;*/ - --font-serif: "Lora", "georgia", serif; + --font-serif: "Libre Baskerville", "georgia", serif; + --font-logo: "Manufacturing Consent", "georgia", serif; /* Typography helpers. */ --font-size-base: 1rem; diff --git a/fonts/LibreBodoni-Bold.woff b/fonts/LibreBodoni-Bold.woff deleted file mode 100755 index 442ef5a..0000000 Binary files a/fonts/LibreBodoni-Bold.woff and /dev/null differ diff --git a/fonts/LibreBodoni-Bold.woff2 b/fonts/LibreBodoni-Bold.woff2 deleted file mode 100755 index 51671e1..0000000 Binary files a/fonts/LibreBodoni-Bold.woff2 and /dev/null differ diff --git a/fonts/LibreBodoni-Italic.woff b/fonts/LibreBodoni-Italic.woff deleted file mode 100755 index f313844..0000000 Binary files a/fonts/LibreBodoni-Italic.woff and /dev/null differ diff --git a/fonts/LibreBodoni-Italic.woff2 b/fonts/LibreBodoni-Italic.woff2 deleted file mode 100755 index 66f2656..0000000 Binary files a/fonts/LibreBodoni-Italic.woff2 and /dev/null differ diff --git a/fonts/LibreBodoni-Regular.woff b/fonts/LibreBodoni-Regular.woff deleted file mode 100755 index 9546c72..0000000 Binary files a/fonts/LibreBodoni-Regular.woff and /dev/null differ diff --git a/fonts/LibreBodoni-Regular.woff2 b/fonts/LibreBodoni-Regular.woff2 deleted file mode 100755 index 35a6a59..0000000 Binary files a/fonts/LibreBodoni-Regular.woff2 and /dev/null differ diff --git a/fonts/Libre_Baskerville/LibreBaskerville-Italic-VariableFont_wght.ttf b/fonts/Libre_Baskerville/LibreBaskerville-Italic-VariableFont_wght.ttf new file mode 100644 index 0000000..0aa649f Binary files /dev/null and b/fonts/Libre_Baskerville/LibreBaskerville-Italic-VariableFont_wght.ttf differ diff --git a/fonts/Libre_Baskerville/LibreBaskerville-Italic-VariableFont_wght.woff2 b/fonts/Libre_Baskerville/LibreBaskerville-Italic-VariableFont_wght.woff2 new file mode 100644 index 0000000..94ab216 Binary files /dev/null and b/fonts/Libre_Baskerville/LibreBaskerville-Italic-VariableFont_wght.woff2 differ diff --git a/fonts/Libre_Baskerville/LibreBaskerville-VariableFont_wght.ttf b/fonts/Libre_Baskerville/LibreBaskerville-VariableFont_wght.ttf new file mode 100644 index 0000000..5795ec1 Binary files /dev/null and b/fonts/Libre_Baskerville/LibreBaskerville-VariableFont_wght.ttf differ diff --git a/fonts/Libre_Baskerville/LibreBaskerville-VariableFont_wght.woff2 b/fonts/Libre_Baskerville/LibreBaskerville-VariableFont_wght.woff2 new file mode 100644 index 0000000..2c566c0 Binary files /dev/null and b/fonts/Libre_Baskerville/LibreBaskerville-VariableFont_wght.woff2 differ diff --git a/fonts/Libre_Baskerville/OFL.txt b/fonts/Libre_Baskerville/OFL.txt new file mode 100644 index 0000000..92b1e6c --- /dev/null +++ b/fonts/Libre_Baskerville/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2012 The Libre Baskerville Project Authors (https://github.com/impallari/Libre-Baskerville) with Reserved Font Name Libre Baskerville. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/fonts/Libre_Baskerville/README.txt b/fonts/Libre_Baskerville/README.txt new file mode 100644 index 0000000..1ac3889 --- /dev/null +++ b/fonts/Libre_Baskerville/README.txt @@ -0,0 +1,71 @@ +Libre Baskerville Variable Font +=============================== + +This download contains Libre Baskerville as both variable fonts and static fonts. + +Libre Baskerville is a variable font with this axis: + wght + +This means all the styles are contained in these files: + Libre_Baskerville/LibreBaskerville-VariableFont_wght.ttf + Libre_Baskerville/LibreBaskerville-Italic-VariableFont_wght.ttf + +If your app fully supports variable fonts, you can now pick intermediate styles +that aren’t available as static fonts. Not all apps support variable fonts, and +in those cases you can use the static font files for Libre Baskerville: + Libre_Baskerville/static/LibreBaskerville-Regular.ttf + Libre_Baskerville/static/LibreBaskerville-Medium.ttf + Libre_Baskerville/static/LibreBaskerville-SemiBold.ttf + Libre_Baskerville/static/LibreBaskerville-Bold.ttf + Libre_Baskerville/static/LibreBaskerville-Italic.ttf + Libre_Baskerville/static/LibreBaskerville-MediumItalic.ttf + Libre_Baskerville/static/LibreBaskerville-SemiBoldItalic.ttf + Libre_Baskerville/static/LibreBaskerville-BoldItalic.ttf + +Get started +----------- + +1. Install the font files you want to use + +2. Use your app's font picker to view the font family and all the +available styles + +Learn more about variable fonts +------------------------------- + + https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts + https://variablefonts.typenetwork.com + https://medium.com/variable-fonts + +In desktop apps + + https://theblog.adobe.com/can-variable-fonts-illustrator-cc + https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts + +Online + + https://developers.google.com/fonts/docs/getting_started + https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide + https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts + +Installing fonts + + MacOS: https://support.apple.com/en-us/HT201749 + Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux + Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows + +Android Apps + + https://developers.google.com/fonts/docs/android + https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts + +License +------- +Please read the full license text (OFL.txt) to understand the permissions, +restrictions and requirements for usage, redistribution, and modification. + +You can use them in your products & projects – print or digital, +commercial or otherwise. + +This isn't legal advice, please consider consulting a lawyer and see the full +license for all details. diff --git a/fonts/Libre_Baskerville/static/LibreBaskerville-Bold.ttf b/fonts/Libre_Baskerville/static/LibreBaskerville-Bold.ttf new file mode 100644 index 0000000..953a005 Binary files /dev/null and b/fonts/Libre_Baskerville/static/LibreBaskerville-Bold.ttf differ diff --git a/fonts/Libre_Baskerville/static/LibreBaskerville-BoldItalic.ttf b/fonts/Libre_Baskerville/static/LibreBaskerville-BoldItalic.ttf new file mode 100644 index 0000000..ab332ab Binary files /dev/null and b/fonts/Libre_Baskerville/static/LibreBaskerville-BoldItalic.ttf differ diff --git a/fonts/Libre_Baskerville/static/LibreBaskerville-Italic.ttf b/fonts/Libre_Baskerville/static/LibreBaskerville-Italic.ttf new file mode 100644 index 0000000..3cfa909 Binary files /dev/null and b/fonts/Libre_Baskerville/static/LibreBaskerville-Italic.ttf differ diff --git a/fonts/Libre_Baskerville/static/LibreBaskerville-Medium.ttf b/fonts/Libre_Baskerville/static/LibreBaskerville-Medium.ttf new file mode 100644 index 0000000..94e7b23 Binary files /dev/null and b/fonts/Libre_Baskerville/static/LibreBaskerville-Medium.ttf differ diff --git a/fonts/Libre_Baskerville/static/LibreBaskerville-MediumItalic.ttf b/fonts/Libre_Baskerville/static/LibreBaskerville-MediumItalic.ttf new file mode 100644 index 0000000..5c3c893 Binary files /dev/null and b/fonts/Libre_Baskerville/static/LibreBaskerville-MediumItalic.ttf differ diff --git a/fonts/Libre_Baskerville/static/LibreBaskerville-Regular.ttf b/fonts/Libre_Baskerville/static/LibreBaskerville-Regular.ttf new file mode 100644 index 0000000..1f3aece Binary files /dev/null and b/fonts/Libre_Baskerville/static/LibreBaskerville-Regular.ttf differ diff --git a/fonts/Libre_Baskerville/static/LibreBaskerville-SemiBold.ttf b/fonts/Libre_Baskerville/static/LibreBaskerville-SemiBold.ttf new file mode 100644 index 0000000..0e4dfd0 Binary files /dev/null and b/fonts/Libre_Baskerville/static/LibreBaskerville-SemiBold.ttf differ diff --git a/fonts/Libre_Baskerville/static/LibreBaskerville-SemiBoldItalic.ttf b/fonts/Libre_Baskerville/static/LibreBaskerville-SemiBoldItalic.ttf new file mode 100644 index 0000000..290ce40 Binary files /dev/null and b/fonts/Libre_Baskerville/static/LibreBaskerville-SemiBoldItalic.ttf differ diff --git a/fonts/Manufacturing_Consent/ManufacturingConsent-Regular.ttf b/fonts/Manufacturing_Consent/ManufacturingConsent-Regular.ttf new file mode 100644 index 0000000..28be09b Binary files /dev/null and b/fonts/Manufacturing_Consent/ManufacturingConsent-Regular.ttf differ diff --git a/fonts/Manufacturing_Consent/ManufacturingConsent-Regular.woff2 b/fonts/Manufacturing_Consent/ManufacturingConsent-Regular.woff2 new file mode 100644 index 0000000..5f75c1e Binary files /dev/null and b/fonts/Manufacturing_Consent/ManufacturingConsent-Regular.woff2 differ diff --git a/fonts/Manufacturing_Consent/OFL.txt b/fonts/Manufacturing_Consent/OFL.txt new file mode 100644 index 0000000..ba5f482 --- /dev/null +++ b/fonts/Manufacturing_Consent/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2019 The Manufacturing Consent Project Authors (https://github.com/googlefonts/manufacturing-consent-font) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/fonts/SourceSans3-Bold.woff b/fonts/SourceSans3/SourceSans3-Bold.woff similarity index 100% rename from fonts/SourceSans3-Bold.woff rename to fonts/SourceSans3/SourceSans3-Bold.woff diff --git a/fonts/SourceSans3-Bold.woff2 b/fonts/SourceSans3/SourceSans3-Bold.woff2 similarity index 100% rename from fonts/SourceSans3-Bold.woff2 rename to fonts/SourceSans3/SourceSans3-Bold.woff2 diff --git a/fonts/SourceSans3-Italic.woff b/fonts/SourceSans3/SourceSans3-Italic.woff similarity index 100% rename from fonts/SourceSans3-Italic.woff rename to fonts/SourceSans3/SourceSans3-Italic.woff diff --git a/fonts/SourceSans3-Italic.woff2 b/fonts/SourceSans3/SourceSans3-Italic.woff2 similarity index 100% rename from fonts/SourceSans3-Italic.woff2 rename to fonts/SourceSans3/SourceSans3-Italic.woff2 diff --git a/fonts/SourceSans3-Regular.woff b/fonts/SourceSans3/SourceSans3-Regular.woff similarity index 100% rename from fonts/SourceSans3-Regular.woff rename to fonts/SourceSans3/SourceSans3-Regular.woff diff --git a/fonts/SourceSans3-Regular.woff2 b/fonts/SourceSans3/SourceSans3-Regular.woff2 similarity index 100% rename from fonts/SourceSans3-Regular.woff2 rename to fonts/SourceSans3/SourceSans3-Regular.woff2 diff --git a/fonts/lora/lora-v14-latin-700.woff2 b/fonts/lora/lora-v14-latin-700.woff2 deleted file mode 100755 index 05498a8..0000000 Binary files a/fonts/lora/lora-v14-latin-700.woff2 and /dev/null differ diff --git a/fonts/lora/lora-v14-latin-italic.woff2 b/fonts/lora/lora-v14-latin-italic.woff2 deleted file mode 100755 index cd150db..0000000 Binary files a/fonts/lora/lora-v14-latin-italic.woff2 and /dev/null differ diff --git a/fonts/lora/lora-v14-latin-regular.woff2 b/fonts/lora/lora-v14-latin-regular.woff2 deleted file mode 100755 index e27b0fd..0000000 Binary files a/fonts/lora/lora-v14-latin-regular.woff2 and /dev/null differ diff --git a/fonts/metropolis/Metropolis-Bold.woff2 b/fonts/metropolis/Metropolis-Bold.woff2 deleted file mode 100755 index 54bb59f..0000000 Binary files a/fonts/metropolis/Metropolis-Bold.woff2 and /dev/null differ diff --git a/fonts/metropolis/Metropolis-Regular.woff2 b/fonts/metropolis/Metropolis-Regular.woff2 deleted file mode 100755 index 40417bf..0000000 Binary files a/fonts/metropolis/Metropolis-Regular.woff2 and /dev/null differ diff --git a/fonts/metropolis/Metropolis-SemiBold.woff2 b/fonts/metropolis/Metropolis-SemiBold.woff2 deleted file mode 100755 index fad6dfd..0000000 Binary files a/fonts/metropolis/Metropolis-SemiBold.woff2 and /dev/null differ diff --git a/templates/includes/preload.twig b/templates/includes/preload.twig index c12259d..0188a0b 100755 --- a/templates/includes/preload.twig +++ b/templates/includes/preload.twig @@ -1,20 +1,4 @@ -{# -/** - * @file - * Preload the non-bold & non-italic fonts for the headings and the body copy. - * - * Available variables: - * - olivesnews_path: Returns the path to the Olivesnews theme. - */ -#} - - - - - -{##} -{##} -{##} -{##} -{##} -{##} + + + +