Merge pull request #1679 from acquia/ACMS-2008

ACMS-2008: Update scripts and installation hooks to gin theme as admin theme.

DEVELOPING.md

@@ -291,11 +291,6 @@ The Acquia CMS profile contains both core and module-specific Site Studio Sync P
 
 To update Site Studio configuration, you can run the `drush acms:config-reset` command and follow the instructions. Note that this will overwrite *any* changes you've made to the default ACMS configuration for Site Studio, and may affect your site in unexpected ways. *You should test using this command in a non-production environment before running it in production.*
 
-### Updating Acquia Claro theming
-* Update SCSS as per requirement in Acquia Claro theme.
-* Use `composer install:frontend` and `composer build:frontend` to compile SCSS into CSS.
-* Commit both CSS and SCSS files.
-
 ### Contributing to Acquia CMS
 
 Refer to our [Contributor's guide](/CONTRIBUTING.md).

acms-run-tests.sh

@@ -136,11 +136,6 @@ case $OSTYPE in
       ;;
 esac
 
-# Compile scss and run css analysis tests.
-echo -e "${GREEN} Installing npm & analysing css ${NOCOLOR}"
-# Install npm & run front end gulp task test.
-cd docroot/themes/contrib/acquia_claro && npm install && npm run test && cd -
-
 # Run code quality checks.
 vendor/bin/grumphp run
 

acms/build.yml

@@ -13,9 +13,10 @@ sites:
       - acquia_cms_tour
       - acquia_cms_video
       - sitestudio_config_management
+      - gin_toolbar
     starter_kit: acquia_cms_existing_site
     themes:
-      admin: acquia_claro
+      admin: gin
       default: cohesion_theme
   headless:
     modules:
@@ -29,9 +30,10 @@ sites:
       - acquia_cms_tour
       - acquia_cms_video
       - consumer_image_styles
+      - gin_toolbar
     starter_kit: acquia_cms_headless
     themes:
-      admin: acquia_claro
+      admin: gin
       default: olivero
   community:
     modules:
@@ -43,7 +45,8 @@ sites:
       - acquia_cms_toolbar
       - acquia_cms_tour
       - acquia_cms_video
+      - gin_toolbar
     starter_kit: acquia_cms_community
     themes:
-      admin: acquia_claro
+      admin: gin
       default: olivero

acquia_cms.module

@@ -35,7 +35,6 @@ function acquia_cms_form_user_login_form_alter(array &$form) {
  */
 function acquia_cms_preprocess_maintenance_page(array &$variables) {
   $variables['#attached']['library'][] = 'seven/install-page';
-  $variables['#attached']['library'][] = 'acquia_claro/install-page';
   $acquia_cms_path = \Drupal::service('extension.list.module')->getPath('acquia_cms');
   $variables['install_page_logo_path'] = '/' . $acquia_cms_path . '/acquia_cms.png';
 }

composer.json

@@ -363,10 +363,6 @@
         "acms:install": [
             "bash install-acms"
         ],
-        "build:frontend": [
-            "Composer\\Config::disableProcessTimeout",
-            "cd docroot/themes/contrib/acquia_claro && npm run build"
-        ],
         "build:local": [
             "cp -f phpunit.xml ./docroot/core"
         ],
@@ -379,10 +375,6 @@
             "rm -rf $TMPDIR/cex"
         ],
         "configure-tarball": "Drupal\\acquia_cms\\Composer\\ConfigureProject::execute",
-        "install:frontend": [
-            "Composer\\Config::disableProcessTimeout",
-            "cd docroot/themes/contrib/acquia_claro && npm install"
-        ],
         "nuke": "rm -r -f docroot vendor"
     }
 }

scripts/acms-split.sh

@@ -220,7 +220,6 @@ function add_drupal_remote() {
     exit 0
   fi
   # Adding remote for drupal git branches.
-  remote drupal_acquia_claro [email protected]:project/acquia_claro.git
   remote drupal_acquia_cms_article [email protected]:project/acquia_cms_article.git
   remote drupal_acquia_cms_audio [email protected]:project/acquia_cms_audio.git
   remote drupal_acquia_cms_common [email protected]:project/acquia_cms_common.git
@@ -251,7 +250,6 @@ function split_drupal_repo() {
     exit 0
   fi
   # Calling split method for mapping drupal remote branches to splits.
-#  split 'themes/acquia_claro' drupal_acquia_claro
   split 'modules/acquia_cms_article' drupal_acquia_cms_article
   split 'modules/acquia_cms_audio' drupal_acquia_cms_audio
   split 'modules/acquia_cms_common' drupal_acquia_cms_common