Commit ed157259 authored by David Suissa's avatar David Suissa
Browse files

Issue #3550270 by dydave: Admin Toolbar Tools: Clean-up and refactoring of CSS...

Issue #3550270 by dydave: Admin Toolbar Tools: Clean-up and refactoring of CSS and removed unused Tools icon for Drupal 8.
parent 2ee24d5e
Loading
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -32,3 +32,10 @@ function admin_toolbar_tools_update_8202() {
    ->set('hoverintent_functionality', TRUE)
    ->save(TRUE);
}

/**
 * Module CSS file refactoring requires cache rebuild.
 */
function admin_toolbar_tools_update_8203() {
  drupal_flush_all_caches();
}
+1 −1
Original line number Diff line number Diff line
toolbar.icon:
  css:
    theme:
      css/tools.css: {}
      css/admin_toolbar_tools.css: {}
+0 −9
Original line number Diff line number Diff line
@@ -31,15 +31,6 @@ function admin_toolbar_tools_toolbar() {
  return $items;
}

/**
 * Implements hook_preprocess_html().
 */
function admin_toolbar_tools_preprocess_html(&$variables) {
  if (\Drupal::currentUser()->hasPermission('access toolbar')) {
    $variables['attributes']['class'][] = 'toolbar-icon-' . intval(\Drupal::VERSION);
  }
}

/**
 * Implements hook_help().
 */
+36 −0
Original line number Diff line number Diff line
/* Admin Toolbar Tools menu icon and local tasks tab styles. */

/* Admin Toolbar Tools link displaying drupal 9 icon in the toolbar. */
.toolbar-icon-admin-toolbar-tools-help {
  /* Hide the default link text: 'Tools' */
  text-indent: -625rem;

  /* Replace the menu label text with the Drupal logo as an icon. */
  &::before {
    box-sizing: content-box;
    margin-left: 0.25rem;
    padding: 0.125rem;
    padding-bottom: 0;
    background-image: url(../images/drupal-logo.svg);
  }
  &:active,
  &.active {
    &::before {
      background-image: url(../images/drupal-logo.svg);
    }
  }
}

/* Local tasks tab and links displayed in the toolbar. */
.local-tasks-toolbar-tab {
  /* Move the local tasks tab to the right side of the toolbar. */
  .toolbar-oriented .toolbar-bar &,
  /* Align the local tasks menu to the right side of the toolbar menu tray. */
  .toolbar-horizontal & .toolbar-menu {
    float: right;
  }
  /* Local tasks tab link icon in the toolbar. */
  .toolbar-icon-local-tasks::before {
    background-image: url(../images/local_tasks.svg);
  }
}

admin_toolbar_tools/css/tools.css

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line
.toolbar-icon-admin-toolbar-tools-help {
  text-indent: -9999px;
}

.toolbar-icon-9 .toolbar-icon-admin-toolbar-tools-help:before,
.toolbar-icon-10 .toolbar-icon-admin-toolbar-tools-help:before,
.toolbar-icon-11 .toolbar-icon-admin-toolbar-tools-help:before {
  box-sizing: content-box;
  background-image: url(../misc/icons/ffffff/drupal-9-logo.svg);
  padding-bottom: 0;
  padding-left: 2px;
  padding-right: 2px;
  padding-top: 2px;
  margin-left: 4px;
}

.toolbar-icon-9 .toolbar-icon-admin-toolbar-tools-help:active:before,
.toolbar-icon-9 .toolbar-icon-admin-toolbar-tools-help.active:before,
.toolbar-icon-10 .toolbar-icon-admin-toolbar-tools-help:active:before,
.toolbar-icon-10 .toolbar-icon-admin-toolbar-tools-help.active:before,
.toolbar-icon-11 .toolbar-icon-admin-toolbar-tools-help:active:before,
.toolbar-icon-11 .toolbar-icon-admin-toolbar-tools-help.active:before {
  background-image: url(../misc/icons/ffffff/drupal-9-logo.svg);
}

.toolbar-icon-8 .toolbar-icon-admin-toolbar-tools-help:before {
  box-sizing: content-box;
  background-image: url(../misc/icons/ffffff/drupal-8-logo.svg);
  padding-bottom: 0;
  padding-left: 4px;
  padding-right: 8px;
  padding-top: 2px;
}

.toolbar-icon-8 .toolbar-icon-admin-toolbar-tools-help:active:before,
.toolbar-icon-8 .toolbar-icon-admin-toolbar-tools-help.active:before {
  background-image: url(../misc/icons/ffffff/drupal-8-logo.svg);
}

.toolbar-oriented .toolbar-bar .local-tasks-toolbar-tab {
  float: right;
}

.toolbar-horizontal .local-tasks-toolbar-tab .toolbar-menu {
  float: right;
}

.toolbar-bar .toolbar-icon-local-tasks:before {
  background-image: url(../misc/icons/bebebe/tasks.svg);
}
Loading