Commit 64bbcf8e authored by Benjamin Melançon's avatar Benjamin Melançon
Browse files

Patch to make re-overriding libraries in subthemes a not-terrible experience also fixes this 

Somehow.  Kind of surprising; i would have expected it maybe to allow Claro to start overriding
libraries the 'correct' way and *then* the subtheme inheritance working, but i'm not going to
complain that this was an instant fix to https://www.drupal.org/project/drupal/issues/2856499
as well as to https://www.drupal.org/project/drupal/issues/2642122

Ref findit#29
parent 415acc41

composer.json

+8 −0
Original line number Diff line number Diff line
@@ -12,5 +12,13 @@ 
    },

    "require": {

        "drupal/claro": "^1.0@alpha"

    },

    "extra": {

        "patches": {

            "drupal/core": {

                "Overriding already overridden libraries-override requires knowledge of previous libraries-overrides": "https://www.drupal.org/files/issues/2019-04-26/2642122-104.patch"

            }

        },

        "enable-patching": true

    }

}

encontrarlo.info.yml

+0 −88
Original line number Diff line number Diff line
@@ -7,94 +7,6 @@ base theme: claro 
libraries:

 - encontrarlo/global



# We need to COPY ALL OF THIS FROM CLARO (and try to keep it up-to-date) because of

# *THIS* horrible bug https://www.drupal.org/project/drupal/issues/2856499

libraries-override:

  system/base:

    css:

      component:

        /core/themes/stable/css/system/components/ajax-progress.module.css: /themes/contrib/claro/css/dist/components/ajax-progress.module.css

        /core/themes/stable/css/system/components/autocomplete-loading.module.css: /themes/contrib/claro/css/dist/components/autocomplete-loading.module.css

        /core/themes/stable/css/system/components/system-status-counter.css: /themes/contrib/claro/css/dist/components/system-status-counter.css

        /core/themes/stable/css/system/components/system-status-report-counters.css: /themes/contrib/claro/css/dist/components/system-status-report-counters.css

        /core/themes/stable/css/system/components/system-status-report-general-info.css: /themes/contrib/claro/css/dist/components/system-status-report-general-info.css

  system/admin:

    css:

      theme:

        /core/themes/stable/css/system/system.admin.css: false



  core/drupal.dropbutton:

    css:

      component:

        /core/themes/stable/css/core/dropbutton/dropbutton.css: /themes/contrib/claro/css/dist/components/dropbutton.css



  core/drupal.vertical-tabs:

    css:

      component:

        /core/themes/stable/css/core/vertical-tabs.css: false



  core/jquery.ui:

    css:

      theme:

        assets/vendor/jquery.ui/themes/base/theme.css: false



  core/jquery.ui.dialog:

    css:

      component:

        assets/vendor/jquery.ui/themes/base/dialog.css: false



  classy/dialog: claro/claro.drupal.dialog



  classy/base:

    css:

      component:

        css/components/action-links.css: false

        css/components/breadcrumb.css: false

        css/components/button.css: false

        css/components/details.css: false

        css/components/dropbutton.css: false

        css/components/form.css: false

        css/components/tabs.css: false

        css/components/pager.css: false

        css/components/tableselect.css: /themes/contrib/claro/css/dist/components/tableselect.css

        css/components/tabledrag.css: /themes/contrib/claro/css/dist/components/tabledrag.css

        css/components/collapse-processed.css: false



  classy/dropbutton:

    css:

      component:

        css/components/dropbutton.css: false



  classy/progress:

    css:

      component:

        css/components/progress.css: /themes/contrib/claro/css/dist/components/progress.css

  # @todo Refactor when https://www.drupal.org/node/2642122 is fixed.



  classy/user: false



  user/drupal.user: claro/form.password-confirm



  field_ui/drupal.field_ui:

    css:

      theme:

        /core/themes/stable/css/field_ui/field_ui.admin.css: /themes/contrib/claro/css/dist/theme/field-ui.admin.css



  filter/drupal.filter.admin:

    css:

      theme:

        /core/themes/stable/css/filter/filter.admin.css: /themes/contrib/claro/css/dist/theme/filter.theme.css



  filter/drupal.filter:

    css:

      theme:

        /core/themes/stable/css/filter/filter.admin.css: /themes/contrib/claro/css/dist/theme/filter.theme.css



  views_ui/admin.styling:

    css:

      theme:

        /core/themes/stable/css/views_ui/views_ui.admin.theme.css: /themes/contrib/claro/css/dist/theme/views_ui.admin.theme.cs



regions:

  header: 'Header'

  pre_content: 'Pre-content'