Commit 8858bfca authored by Mahmoud Zayed's avatar Mahmoud Zayed
Browse files

Issue #3296689 by Project Update Bot, mahmoud-zayed: Drupal 10 compatibility fixes.

parent 52ae94c6

bootstrap_styles.info.yml

+1 −2
Original line number Diff line number Diff line 
name: 'Bootstrap Styles'

description: 'Add a plugins builder and a collection of reusable plugins to the Layout Builder module.'

type: module

core: 8.x

core_version_requirement: ^8 || ^9

core_version_requirement: ^9.3 || ^10

package: 'Layout Builder'

configure: bootstrap_styles.settings

dependencies:

composer.json

+3 −3
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ 
  "license": "GPL-2.0+",

  "description": "Add a plugins builder and a collection of reusable plugins to the Layout Builder module.",

  "require": {

      "drupal/core": "^8.7.7 || ^9",

    "drupal/media_library_form_element": "^2.0",

      "drupal/media_library_theme_reset": "^1.0"

    "drupal/media_library_theme_reset": "^1.0",

    "drupal/core": "^9.3 || ^10"

  }

}

src/Plugin/BootstrapStyles/Style/BackgroundColor.php

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ class BackgroundColor extends StylePluginBase { 
   * {@inheritdoc}

   */

  public function buildStyleFormElements(array &$form, FormStateInterface $form_state, $storage) {

    $icon_path = drupal_get_path('module', 'bootstrap_styles') . '/images/';

    $icon_path = \Drupal::service('extension.list.module')->getPath('bootstrap_styles') . '/images/';

    $form['background_type']['#options']['color'] = $this->getSvgIconMarkup($icon_path . 'plugins/background/background-color.svg');

    $form['background_type']['#default_value'] = $storage['background']['background_type'] ?? 'color';

src/Plugin/BootstrapStyles/Style/BackgroundMedia.php

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ class BackgroundMedia extends StylePluginBase implements ContainerFactoryPluginI 
   * {@inheritdoc}

   */

  public function buildStyleFormElements(array &$form, FormStateInterface $form_state, $storage) {

    $icon_path = drupal_get_path('module', 'bootstrap_styles') . '/images/';

    $icon_path = \Drupal::service('extension.list.module')->getPath('bootstrap_styles') . '/images/';

    $form['background_type']['#options']['image'] = $this->getSvgIconMarkup($icon_path . 'plugins/background/background-image.svg');

    $form['background_type']['#options']['video'] = $this->getSvgIconMarkup($icon_path . 'plugins/background/background-video.svg');

    if (!$form['background_type']['#default_value']) {

src/Plugin/BootstrapStyles/Style/Border.php

+1 −1
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ class Border extends StylePluginBase { 
      $default_value = $this->getStyleOptionIndexByClass('rounded_corners', $storage['border']['rounded_corners']['class']);

    }



    $icon_path = drupal_get_path('module', 'bootstrap_styles') . '/images/';

    $icon_path = \Drupal::service('extension.list.module')->getPath('bootstrap_styles') . '/images/';



    $form['rounded_corners'] = [

      '#type' => 'range',