Merge branch 'main' into lee5151 (188a0cd8) · Commits · ASC IRIS Web Services / Drupal Upstream · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

Drupal Upstream
- Activity
- Members
- Labels

Snippets Groups Projects

188a0cd8

Commit 188a0cd8 authored 1 year ago by Michael Lee

Downloads
- Plain Diff

Merge branch 'main' into lee5151

parents 4af60140 1738bc30

No related branches found

No related tags found

3 merge requests!62Module Updates,!60Drupal Module Updates,!56Add Imagecache Modules

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

composer.lock 13 additions, 13 deletions

composer.lock
vendor/composer/installed.json 15 additions, 15 deletions

vendor/composer/installed.json
vendor/composer/installed.php 38 additions, 38 deletions

vendor/composer/installed.php
web/core/lib/Drupal.php 1 addition, 1 deletion

web/core/lib/Drupal.php
web/core/modules/system/src/PathBasedBreadcrumbBuilder.php 4 additions, 0 deletions

web/core/modules/system/src/PathBasedBreadcrumbBuilder.php
web/themes/asc_bootstrap_bux/asc_bootstrap_bux.theme 12 additions, 0 deletions

web/themes/asc_bootstrap_bux/asc_bootstrap_bux.theme
web/themes/asc_bootstrap_bux/assets/sass/components/_academic-programs.scss 7 additions, 6 deletions

...tstrap_bux/assets/sass/components/_academic-programs.scss
web/themes/asc_bootstrap_bux/assets/sass/components/_filters.scss 11 additions, 0 deletions

...es/asc_bootstrap_bux/assets/sass/components/_filters.scss
web/themes/asc_bootstrap_bux/assets/sass/components/_menu.scss 1 addition, 1 deletion

...hemes/asc_bootstrap_bux/assets/sass/components/_menu.scss
web/themes/asc_bootstrap_bux/css/style.css 29 additions, 19 deletions

web/themes/asc_bootstrap_bux/css/style.css
web/themes/asc_bootstrap_bux/css/style.css.map 1 addition, 1 deletion

web/themes/asc_bootstrap_bux/css/style.css.map
web/themes/asc_bootstrap_bux/templates/paragraph/paragraph--columns_four.html.twig 2 additions, 2 deletions

...bux/templates/paragraph/paragraph--columns_four.html.twig
web/themes/asc_bootstrap_bux/templates/paragraph/paragraph--columns_three.html.twig 4 additions, 4 deletions

...ux/templates/paragraph/paragraph--columns_three.html.twig
web/themes/asc_bootstrap_bux/templates/paragraph/paragraph--columns_two.html.twig 4 additions, 4 deletions

..._bux/templates/paragraph/paragraph--columns_two.html.twig

with 142 additions and 104 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment