Skip to content

Commit

Permalink
Merge pull request #13 from droptica/develop
Browse files Browse the repository at this point in the history
- Cleanup of profile and custom module config. Fixed langcodes in yml files.
- Enabled Simple XML sitemap module with some custom configuration.
- Enabled Linkit module with some custom configuration.
- Made google_tag image optional, not required.
- Cleanup of input formats (no Basic HTML and Restricted HTML anymore).
- CKEditor with more buttons and extended internal linking.
- Improved image scaling in "Side image" paragraph. 
- "Side image" paragraph now have the default value of image side.
- All H1, H2, H3... headers have elastic styling now, there are new variables to change their colors and fonts.
- Admin tabs are now visible above nodes and user pages.
- Removed package-lock.json from theme.
  • Loading branch information
grzegorz-pietrzak-droptica authored Jan 17, 2018
2 parents 0f92651 + 2922228 commit 565a916
Show file tree
Hide file tree
Showing 141 changed files with 376 additions and 11,850 deletions.
4 changes: 3 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@
"drupal/link_attributes": "^1.1",
"drupal/menu_link_attributes": "^1.0",
"drupal/contact_formatter": "^1.0",
"drupal/smtp": "^1.0@beta"
"drupal/smtp": "^1.0@beta",
"drupal/simple_sitemap": "^2.11",
"drupal/linkit": "^4.3"
},
"conflict": {
"drupal/drupal": "*"
Expand Down
2 changes: 1 addition & 1 deletion config/install/block_content.type.content_block.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
langcode: pl
langcode: en
status: true
dependencies: { }
id: content_block
Expand Down
3 changes: 0 additions & 3 deletions config/install/contact.form.feedback.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
uuid: db77d29b-0227-4d5f-a50a-dc377ceb61bd
langcode: en
status: true
dependencies: { }
_core:
default_config_hash: vymHlgJy26BuI5GGj9-IXjwR3dRC5C0tij4BpWJnoqw
id: feedback
label: 'Website feedback'
recipients:
Expand Down
3 changes: 0 additions & 3 deletions config/install/contact.form.personal.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
uuid: 679487da-2ba6-4a0b-bf32-ac42f270f4ca
langcode: en
status: true
dependencies: { }
_core:
default_config_hash: jonvgt3CkUM2eMLTFwWfHileWWDC4YtXCuIlCahTk_I
id: personal
label: 'Personal contact form'
recipients: { }
Expand Down
2 changes: 0 additions & 2 deletions config/install/contact.settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,3 @@ flood:
limit: 5
interval: 3600
user_default_enabled: true
_core:
default_config_hash: U69DBeuvXuNVOC15rVNaBjDPK2fWFbo9v4takdYSSO8
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
uuid: 3af68b8d-5572-4e3f-8d65-b0b68059cc52
langcode: pl
langcode: en
status: true
dependencies:
config:
Expand All @@ -8,23 +7,21 @@ dependencies:
- field.field.block_content.content_block.field_d_main_title
module:
- text
_core:
default_config_hash: QQS1dUfX_jZ-WrQYmLb4qFWYtZQxM6ypCLlu0jANzRA
id: block_content.content_block.default
targetEntityType: block_content
bundle: content_block
mode: default
content:
field_d_long_text:
weight: 26
weight: 3
settings:
rows: 5
placeholder: ''
third_party_settings: { }
type: text_textarea
region: content
field_d_main_title:
weight: 27
weight: 1
settings:
size: 60
placeholder: ''
Expand All @@ -33,7 +30,7 @@ content:
region: content
info:
type: string_textfield
weight: -5
weight: 0
region: content
settings:
size: 60
Expand All @@ -43,7 +40,8 @@ content:
type: language_select
weight: 2
region: content
settings: { }
settings:
include_locked: true
third_party_settings: { }
translation:
weight: 10
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
langcode: pl
langcode: en
status: true
dependencies:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
uuid: 6e3e92e8-b397-452f-b65f-64d47c7756cc
langcode: pl
langcode: en
status: true
dependencies:
config:
Expand All @@ -8,8 +7,6 @@ dependencies:
- field.field.block_content.content_block.field_d_main_title
module:
- text
_core:
default_config_hash: ORQrDLJG2VtkKot9celtFUtEX2z8OXu2-0ym4FDwN-U
id: block_content.content_block.default
targetEntityType: block_content
bundle: content_block
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
langcode: pl
langcode: en
status: true
dependencies:
config:
Expand Down
9 changes: 9 additions & 0 deletions config/install/core.entity_view_mode.block_content.token.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
langcode: en
status: true
dependencies:
module:
- block_content
id: block_content.token
label: Token
targetEntityType: block_content
cache: true
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
langcode: en
status: true
dependencies:
module:
- menu_link_content
id: menu_link_content.token
label: Token
targetEntityType: menu_link_content
cache: true
2 changes: 0 additions & 2 deletions config/install/droopler_theme.settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ droopler_theme_navbar_top_background: faded
droopler_theme_navbar_position: ''
droopler_theme_navbar_color: ''
droopler_theme_navbar_background: inverse
_core:
default_config_hash: nob_Ac8aKrLAUYsiF8Pz433Ttm5QiXzyjIklu2YcF2c
langcode: en
features:
node_user_picture: true
Expand Down
52 changes: 0 additions & 52 deletions config/install/editor.editor.basic_html.yml

This file was deleted.

26 changes: 24 additions & 2 deletions config/install/editor.editor.full_html.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,36 @@ settings:
items:
- Bold
- Italic
- Underline
- Strike
- Superscript
- Subscript
- '-'
- RemoveFormat
- '-'
-
name: Undo
items:
- Undo
- Redo
-
name: Alignment
items:
- JustifyLeft
- JustifyCenter
- JustifyRight
- JustifyBlock
-
name: Linking
items:
- DrupalLink
- Linkit
- DrupalUnlink
-
name: Lists
items:
- BulletedList
- NumberedList
- Outdent
- Indent
-
name: Media
items:
Expand All @@ -45,11 +60,18 @@ settings:
-
name: Tools
items:
- SpecialChar
- Language
- ShowBlocks
- Source
- Maximize
plugins:
stylescombo:
styles: ''
language:
language_list: un
linkit:
linkit_profile: content_nodes
image_upload:
status: true
scheme: public
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
uuid: 81501ecc-94ab-44a6-8178-bb90edc3974f
langcode: pl
langcode: en
status: true
dependencies:
config:
- block_content.type.content_block
- field.storage.block_content.field_d_long_text
module:
- text
_core:
default_config_hash: muGpB-Uq5WFCk6W1dbedguWRh8J7AipCWj8AugEMl-0
id: block_content.content_block.field_d_long_text
field_name: field_d_long_text
entity_type: block_content
bundle: content_block
label: d_long_text
label: Body
description: ''
required: false
translatable: false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
langcode: pl
langcode: en
status: true
dependencies:
config:
Expand All @@ -8,7 +8,7 @@ id: block_content.content_block.field_d_main_title
field_name: field_d_main_title
entity_type: block_content
bundle: content_block
label: d_main_title
label: Title
description: ''
required: false
translatable: false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
langcode: pl
langcode: en
status: true
dependencies:
module:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
langcode: pl
langcode: en
status: true
dependencies:
module:
Expand Down
2 changes: 1 addition & 1 deletion config/install/filter.format.basic_html.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
langcode: en
status: true
status: false
dependencies:
module:
- editor
Expand Down
2 changes: 1 addition & 1 deletion config/install/filter.format.restricted_html.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
langcode: en
status: true
status: false
dependencies: { }
name: 'Restricted HTML'
format: restricted_html
Expand Down
1 change: 0 additions & 1 deletion config/install/language.entity.en.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
uuid: 5c0625d7-22d6-40d6-94de-d7ec9b341b35
langcode: en
status: true
dependencies: { }
Expand Down
1 change: 0 additions & 1 deletion config/install/language.entity.pl.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
uuid: 8d75829d-94dd-4f92-8f53-4fece0641761
langcode: en
status: true
dependencies: { }
Expand Down
25 changes: 25 additions & 0 deletions config/install/linkit.linkit_profile.standard.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
langcode: en
status: true
dependencies:
module:
- node
id: content_nodes
label: 'Content nodes'
description: ''
attributes:
target:
id: target
weight: 0
settings:
widget_type: simple_checkbox
matchers:
a0278b17-a284-42b8-ac99-54c4d4c39dbe:
uuid: a0278b17-a284-42b8-ac99-54c4d4c39dbe
id: 'entity:node'
weight: 0
settings:
result_description: '[node:langcode], [node:author], [node:created]'
bundles:
content_page: content_page
group_by_bundle: false
include_unpublished: false
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
index: 1
priority: '0.5'
changefreq: ''
include_images: 0
13 changes: 13 additions & 0 deletions config/install/simple_sitemap.settings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
max_links: 2000
cron_generate: true
cron_generate_interval: 0
remove_duplicates: true
skip_untranslated: true
batch_process_limit: 1500
base_url: ''
custom_links_include_images: false
excluded_languages: { }
enabled_entity_types:
- node
- taxonomy_term
- menu_link_content
5 changes: 1 addition & 4 deletions config/install/system.site.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
uuid: 303cb136-88a8-4a9a-ac4e-8b53879d6024
name: Droopler
mail: [email protected]
slogan: ''
Expand All @@ -9,6 +8,4 @@ page:
admin_compact_mode: false
weight_select_max: 100
langcode: en
default_langcode: pl
_core:
default_config_hash: AyT9s8OUcclfALRE_imByOMgtZ19eOlqdF6zI3p7yqo
default_langcode: en
Loading

0 comments on commit 565a916

Please sign in to comment.