From d38cdacedd5edfbd0cfd3d10b71e09678deadfbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Fri, 30 Aug 2019 15:32:44 -0400 Subject: [PATCH] Format SCSS to use CSS-safe comments so i don't break everything again when doing CSS --- config/sync/block.block.articletopics.yml | 2 +- config/sync/block.block.articletype.yml | 2 +- config/sync/block.block.test.yml | 29 +++++++++++++++++++ ...hot.config_sync.module.default_content.yml | 11 +++++++ config/sync/core.extension.yml | 1 + ...block_content.fixed_block_content.test.yml | 12 ++++++++ .../geofresco/src/global/_components.scss | 21 +++++++------- 7 files changed, 66 insertions(+), 12 deletions(-) create mode 100644 config/sync/block.block.test.yml create mode 100644 config/sync/config_snapshot.snapshot.config_sync.module.default_content.yml create mode 100644 config/sync/fixed_block_content.fixed_block_content.test.yml diff --git a/config/sync/block.block.articletopics.yml b/config/sync/block.block.articletopics.yml index 3070950..b9f3d42 100644 --- a/config/sync/block.block.articletopics.yml +++ b/config/sync/block.block.articletopics.yml @@ -12,7 +12,7 @@ dependencies: id: articletopics theme: geofresco region: sidebar_first -weight: -8 +weight: -9 provider: null plugin: 'facet_block:article_topics' settings: diff --git a/config/sync/block.block.articletype.yml b/config/sync/block.block.articletype.yml index dfbc90c..d49b797 100644 --- a/config/sync/block.block.articletype.yml +++ b/config/sync/block.block.articletype.yml @@ -12,7 +12,7 @@ dependencies: id: articletype theme: geofresco region: sidebar_first -weight: -7 +weight: -8 provider: null plugin: 'facet_block:article_type' settings: diff --git a/config/sync/block.block.test.yml b/config/sync/block.block.test.yml new file mode 100644 index 0000000..7fa1c4b --- /dev/null +++ b/config/sync/block.block.test.yml @@ -0,0 +1,29 @@ +uuid: 244b7196-d70f-4c7f-a6cc-052613934da2 +langcode: en +status: true +dependencies: + config: + - fixed_block_content.fixed_block_content.test + module: + - block_visibility_groups + - fixed_block_content + theme: + - geofresco +id: test +theme: geofresco +region: tile_one +weight: -8 +provider: null +plugin: 'fixed_block_content:test' +settings: + id: 'fixed_block_content:test' + label: Test + provider: fixed_block_content + label_display: '0' + view_mode: '' +visibility: + condition_group: + id: condition_group + negate: false + block_visibility_group: '' + context_mapping: { } diff --git a/config/sync/config_snapshot.snapshot.config_sync.module.default_content.yml b/config/sync/config_snapshot.snapshot.config_sync.module.default_content.yml new file mode 100644 index 0000000..3fe9cf4 --- /dev/null +++ b/config/sync/config_snapshot.snapshot.config_sync.module.default_content.yml @@ -0,0 +1,11 @@ +uuid: 4397074c-50bf-4bc6-a5e4-c6237f9fa9f2 +langcode: en +status: true +dependencies: + module: + - default_content +id: config_sync.module.default_content +snapshotSet: config_sync +extensionType: module +extensionName: default_content +items: { } diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 93d99db..50cebf0 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -31,6 +31,7 @@ module: ctools: 0 datetime: 0 dblog: 0 + default_content: 0 drutopia_article: 0 drutopia_blog: 0 drutopia_collection: 0 diff --git a/config/sync/fixed_block_content.fixed_block_content.test.yml b/config/sync/fixed_block_content.fixed_block_content.test.yml new file mode 100644 index 0000000..8b29992 --- /dev/null +++ b/config/sync/fixed_block_content.fixed_block_content.test.yml @@ -0,0 +1,12 @@ +uuid: b0d8dca6-8a54-4dc2-9de5-b4181947f699 +langcode: en +status: true +dependencies: + config: + - block_content.type.basic + content: + - 'block_content:basic:979bd711-02c7-4365-90d6-68a2df808816' +id: test +title: Test +block_content_bundle: basic +default_content: '{"_links":{"self":{"href":"https:\/\/geo.ddev.site\/block\/2?_format=hal_json"},"type":{"href":"http:\/\/fixed_block_content.drupal.org\/rest\/type\/block_content\/basic"}},"langcode":[{"value":"en","lang":"en"}],"type":[{"target_id":"basic"}],"status":[{"value":true,"lang":"en"}],"info":[{"value":"Test","lang":"en"}],"reusable":[{"value":true}],"default_langcode":[{"value":true,"lang":"en"}],"revision_translation_affected":[{"value":true,"lang":"en"}],"metatag":[{"value":{"title":"| Grassroots Economic Organizing","canonical_url":"https:\/\/geo.ddev.site\/block\/2"}}],"body":[{"value":"\u003Cp\u003EHEEEEEY this is a test Test TEST\u003C\/p\u003E\r\n\r\n\u003Cp\u003EPlease... do something?\u003C\/p\u003E\r\n","format":"basic_html","processed":"\u003Cp\u003EHEEEEEY this is a test Test TEST\u003C\/p\u003E\n\n\u003Cp\u003EPlease... do something?\u003C\/p\u003E","summary":"","lang":"en"}]}' diff --git a/web/themes/custom/geofresco/src/global/_components.scss b/web/themes/custom/geofresco/src/global/_components.scss index b6e29bc..ab8e81a 100644 --- a/web/themes/custom/geofresco/src/global/_components.scss +++ b/web/themes/custom/geofresco/src/global/_components.scss @@ -1,10 +1,14 @@ @charset "UTF-8"; -// Extend or override Bulma's components, -// ../../node_modules/bulma/sass/components +/** + * Extend or override Bulma's components, + * ../../node_modules/bulma/sass/components + */ -// Make menu items slightly less far apart so we never entirely lose -// 'Community' on mid-size screens. -// See https://gitlab.com/drutopia/octavia/issues/52 +/** + * Make menu items slightly less far apart so we never entirely lose + * 'Community' on mid-size screens. + * See https://gitlab.com/drutopia/octavia/issues/52 + */ .navbar-item, .navbar-link { padding-left: .75rem; padding-right: .75rem; @@ -14,8 +18,7 @@ } } -// Featured images on article pages - +/* Featured images on article pages */ .featured-image figure.image { width: 100vw; position: relative; @@ -33,9 +36,7 @@ padding: 0.5rem 1.5rem 1.5rem; } -// Give titles, from which we removed the Hero classes, the same padding -// as sections. - +/* Give titles, from which we removed the Hero classes, the same padding as sections. */ .block-page-title-block { padding: 1rem 1.5rem; }