Verified Commit cbde8d69 authored by Dave Long's avatar Dave Long
Browse files

task: #3586951 Remove Settings Tray integration in Default Admin, keep in Stable 9

By: quietone
By: gábor hojtsy
By: mherchel
By: dcam
By: smustgrave
By: longwave
(cherry picked from commit b0900357)
parent a0d63927
Loading
Loading
Loading
Loading
Loading
+0 −12
Original line number Diff line number Diff line
@@ -383,8 +383,6 @@ navigation:
    - default_admin/node_preview
    - default_admin/contextual_links
    - default_admin/breadcrumb
    - default_admin/settings_tray
    - default_admin/settings_tray_edit

# Toolbar

@@ -399,7 +397,6 @@ toolbar:
    - default_admin/node_preview
    - default_admin/contextual_links
    - default_admin/breadcrumb
    - default_admin/settings_tray_edit
    - core/once

# Accent
@@ -557,15 +554,6 @@ node_preview:
    component:
      migration/css/components/node_preview.css: { minified: false }

settings_tray:
  css:
    component:
      migration/css/components/settings_tray.css: { minified: false }

settings_tray_edit:
  css:
    component:
      migration/css/components/settings_tray_edit.css: { minified: false }

maintenance_page:
  css:
+0 −51
Original line number Diff line number Diff line
/*
 * DO NOT EDIT THIS FILE.
 * See the following change record for more information,
 * https://www.drupal.org/node/3084859
 * @preserve
 */

/**
 * @file
 * Settings tray toolbar styles.
 */

#gin-toolbar-bar {
  position: fixed;

  &.js-settings-tray-edit-mode {
    background: var(--gin-color-primary);

    button.toolbar-icon.toolbar-icon-edit.toolbar-item.is-active {
      color: var(--gin-bg-app);

      &:hover {
        background: var(--gin-color-primary-hover);
      }
    }
  }

  .contextual-toolbar-tab {
    order: 100;
  }
}

#toolbar-bar.toolbar-bar.js-settings-tray-edit-mode {
  border-radius: var(--gin-border-s);
  background-color: transparent;

  .toolbar-item,
  .toolbar-item.is-active:hover {
    border-radius: var(--gin-border-s);
    background: var(--gin-switch);
  }

  .toolbar-item::before,
  .toolbar-item.is-active:hover::before {
    background-color: #fff;
  }

  button.toolbar-icon.toolbar-icon-edit.toolbar-item.is-active:hover {
    background-image: none;
  }
}
+0 −44
Original line number Diff line number Diff line
/**
 * @file
 * Settings tray toolbar styles.
 */

#gin-toolbar-bar {
  position: fixed;

  &.js-settings-tray-edit-mode {
    background: var(--gin-color-primary);

    button.toolbar-icon.toolbar-icon-edit.toolbar-item.is-active {
      color: var(--gin-bg-app);

      &:hover {
        background: var(--gin-color-primary-hover);
      }
    }
  }

  .contextual-toolbar-tab {
    order: 100;
  }
}

#toolbar-bar.toolbar-bar.js-settings-tray-edit-mode {
  border-radius: var(--gin-border-s);
  background-color: transparent;

  .toolbar-item,
  .toolbar-item.is-active:hover {
    border-radius: var(--gin-border-s);
    background: var(--gin-switch);
  }

  .toolbar-item::before,
  .toolbar-item.is-active:hover::before {
    background-color: #fff;
  }

  button.toolbar-icon.toolbar-icon-edit.toolbar-item.is-active:hover {
    background-image: none;
  }
}
+0 −18
Original line number Diff line number Diff line
/*
 * DO NOT EDIT THIS FILE.
 * See the following change record for more information,
 * https://www.drupal.org/node/3084859
 * @preserve
 */

/**
 * @file
 * Settings tray edit mode styles.
 */

.dialog-off-canvas-main-canvas.js-settings-tray-edit-mode .settings-tray-editable.settings-tray-editable {
  &:hover,
  &.settings-tray-active-editable {
    background-color: var(--gin-bg-item-hover);
  }
}
+0 −11
Original line number Diff line number Diff line
/**
 * @file
 * Settings tray edit mode styles.
 */

.dialog-off-canvas-main-canvas.js-settings-tray-edit-mode .settings-tray-editable.settings-tray-editable {
  &:hover,
  &.settings-tray-active-editable {
    background-color: var(--gin-bg-item-hover);
  }
}