Skip to content

Commit

Permalink
feat: move AMP into its own theme
Browse files Browse the repository at this point in the history
refactor: remove conflict

build: use tag

[TEST_EVERYTHING]

[TEST_EVERYTHING]
  • Loading branch information
chrfritsch committed Apr 15, 2020
1 parent 7c6a134 commit 3b2d82b
Show file tree
Hide file tree
Showing 26 changed files with 3 additions and 1,065 deletions.
9 changes: 1 addition & 8 deletions composer.json
Expand Up @@ -60,9 +60,6 @@
"drupal/diff": {
"Back button for comparison page": "https://www.drupal.org/files/issues/back_button_for-2853193-4.patch"
},
"drupal/amp": {
"Missing schema": "https://www.drupal.org/files/issues/missing_schema_for-2878769-3.patch"
},
"drupal/entity_browser": {
"Provide inline entity form FieldWidgetDisplay": "https://www.drupal.org/files/issues/2019-07-04/2858438_17.patch",
"Re-order + remove broken with the Entity Reference (and File) widget": "https://www.drupal.org/files/issues/2020-03-30/2851580-83.patch"
Expand All @@ -82,8 +79,6 @@
"require": {
"composer/installers": "^1.2",
"cweagans/composer-patches": "^1.6.5",
"drupal/amp": "1.2",
"drupal/amptheme": "^1.1",
"marc1706/fast-image-size": "^1.1.0",
"oomphinc/composer-installers-extender": "^1.1",
"drupal/access_unpublished": "^1.0-alpha8",
Expand Down Expand Up @@ -137,6 +132,7 @@
"drupal/slick": "^2.0-rc3",
"drupal/slick_media": "^2.0-alpha2",
"drupal/thunder_admin": "^3.0",
"drupal/thunder_amp": "^1.0-beta2",
"drupal/thunder_fia": "^1.0",
"drupal/token": "^1.0",
"drupal/update_helper": "^1.3",
Expand Down Expand Up @@ -170,8 +166,5 @@
"drupal/config_profile": "^1.0",
"mglaman/phpstan-drupal": "~0.12.0",
"phpstan/phpstan-deprecation-rules": "~0.12.0"
},
"conflict": {
"masterminds/html5": "^2.4.0"
}
}
2 changes: 2 additions & 0 deletions drupal-org.make
Expand Up @@ -119,6 +119,8 @@ projects[thunder_admin][type] = theme
projects[thunder_admin][version] = 3
projects[thunder_fia][type] = module
projects[thunder_fia][version] = 1
projects[thunder_amp][type] = module
projects[thunder_amp][version] = 1
projects[token][type] = module
projects[token][version] = 1
projects[update_helper][type] = module
Expand Down
26 changes: 0 additions & 26 deletions themes/thunder_amp/README.md

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

25 changes: 0 additions & 25 deletions themes/thunder_amp/logo.svg

This file was deleted.

Binary file removed themes/thunder_amp/screenshot.png
Binary file not shown.

0 comments on commit 3b2d82b

Please sign in to comment.