Commit 1694be09 authored by Sascha Eggenberger's avatar Sascha Eggenberger
Browse files

More admin_toolbar 3.3.1 fixes

parent e7f72df9

dist/css/components/toolbar.css

+7 −2
Original line number Diff line number Diff line
@@ -495,6 +495,7 @@ body.gin--classic-toolbar { 
}



.toolbar-tray-horizontal .menu-item.hover-intent,

.toolbar-tray-horizontal .menu-item:focus-within,

.toolbar-tray-horizontal .menu-item--expanded {

  background-color: transparent;

}
@@ -567,19 +568,23 @@ body.gin--classic-toolbar { 
  transform: scaleX(-1);

}



.toolbar .toolbar-icon.toolbar-handle.menu-item--active-trail::before, .toolbar .toolbar-handle.menu-item--active-trail.responsive-preview-icon::before, .toolbar .toolbar-icon.toolbar-handle:hover::before, .toolbar .toolbar-handle.responsive-preview-icon:hover::before, .toolbar .toolbar-icon.toolbar-handle:focus::before, .toolbar .toolbar-handle.responsive-preview-icon:focus::before,

.toolbar .toolbar-icon.toolbar-handle.menu-item--active-trail::before, .toolbar .toolbar-handle.menu-item--active-trail.responsive-preview-icon::before, .toolbar .toolbar-icon.toolbar-handle:hover::before, .toolbar .toolbar-handle.responsive-preview-icon:hover::before, .toolbar .toolbar-icon.toolbar-handle:focus::before, .toolbar .toolbar-handle.responsive-preview-icon:focus::before, .toolbar .toolbar-icon.toolbar-handle:focus-within::before, .toolbar .toolbar-handle.responsive-preview-icon:focus-within::before,

.toolbar .toolbar-icon.toolbar-handle.open.menu-item--active-trail::before,

.toolbar .toolbar-icon.toolbar-handle.open:hover::before,

.toolbar .toolbar-icon.toolbar-handle.open:focus::before,

.toolbar .toolbar-icon.toolbar-handle.open:focus-within::before,

.toolbar .toolbar-menu .toolbar-menu .toolbar-icon.toolbar-handle.menu-item--active-trail::before,

.toolbar .toolbar-menu .toolbar-menu .toolbar-icon.toolbar-handle:hover::before,

.toolbar .toolbar-menu .toolbar-menu .toolbar-icon.toolbar-handle:focus::before,

.toolbar .toolbar-menu .toolbar-menu .toolbar-icon.toolbar-handle:focus-within::before,

.toolbar .toolbar-menu .toolbar-menu .toolbar-icon.toolbar-handle.open.menu-item--active-trail::before,

.toolbar .toolbar-menu .toolbar-menu .toolbar-icon.toolbar-handle.open:hover::before,

.toolbar .toolbar-menu .toolbar-menu .toolbar-icon.toolbar-handle.open:focus::before,

.toolbar .toolbar-menu .toolbar-menu .toolbar-icon.toolbar-handle.open:focus-within::before,

.toolbar-tray-horizontal ul li.menu-item--expanded ul li.menu-item--expanded.menu-item--active-trail::before,

.toolbar-tray-horizontal ul li.menu-item--expanded ul li.menu-item--expanded:hover::before,

.toolbar-tray-horizontal ul li.menu-item--expanded ul li.menu-item--expanded:focus::before {

.toolbar-tray-horizontal ul li.menu-item--expanded ul li.menu-item--expanded:focus::before,

.toolbar-tray-horizontal ul li.menu-item--expanded ul li.menu-item--expanded:focus-within::before {

  background-color: var(--gin-color-primary);

}

dist/css/layout/toolbar.css

+6 −3
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ 
  color: var(--gin-color-text);

}



.toolbar .toolbar-tray .menu-item--active-trail > .toolbar-box a,

.toolbar .toolbar-tray .menu-item--active-trail > .toolbar-box > a.toolbar-icon,

.toolbar .toolbar-tray a.is-active {

  color: var(--gin-color-primary);

  font-weight: var(--gin-font-weight-semibold);
@@ -221,7 +221,7 @@ 
}



@media (max-width: 60.99em) {

  .toolbar .toolbar-tray .menu-item--active-trail > .toolbar-box a,

  .toolbar .toolbar-tray .menu-item--active-trail > .toolbar-box > a.toolbar-icon,

  .toolbar .toolbar-tray a.is-active {

    width: 100%;

    background: var(--gin-color-primary-light);
@@ -561,6 +561,7 @@ a.toolbar-menu__trigger, 
  }



  .toolbar-menu-administration > .toolbar-menu > .menu-item .toolbar-menu .menu-item {

    float: none;

    border-top: 0 none;

    border-bottom: 0 none;

  }
@@ -629,7 +630,9 @@ a.toolbar-menu__trigger, 
  }



  .toolbar-menu-administration .menu-item .menu-item:hover > .toolbar-icon,

  .toolbar-menu-administration .menu-item .menu-item:hover > .toolbar-box .toolbar-icon {

  .toolbar-menu-administration .menu-item .menu-item:focus-within > .toolbar-icon,

  .toolbar-menu-administration .menu-item .menu-item:hover > .toolbar-box > .toolbar-icon,

  .toolbar-menu-administration .menu-item .menu-item:focus-within > .toolbar-box > .toolbar-icon {

    color: var(--gin-color-primary-hover);

    background: var(--gin-color-primary-light);

  }

styles/components/toolbar.scss

+3 −1
Original line number Diff line number Diff line
@@ -487,6 +487,7 @@ body.gin--classic-toolbar { 
.toolbar-tray-horizontal {

  // admin_toolbar 3.3.1 fix

  .menu-item.hover-intent,

  .menu-item:focus-within,

  .menu-item--expanded {

    background-color: transparent;

  }
@@ -555,7 +556,8 @@ body.gin--classic-toolbar { 


  &.menu-item--active-trail,

  &:hover,

  &:focus {

  &:focus,

  &:focus-within {

    &::before {

      background-color: var(--gin-color-primary);

    }

styles/layout/toolbar.scss

+5 −2
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ 
  }

}



.toolbar .toolbar-tray .menu-item--active-trail > .toolbar-box a,

.toolbar .toolbar-tray .menu-item--active-trail > .toolbar-box > a.toolbar-icon,

.toolbar .toolbar-tray a.is-active {

  color: var(--gin-color-primary);

  font-weight: var(--gin-font-weight-semibold);
@@ -465,6 +465,7 @@ a.toolbar-menu__trigger, 
          }



          .menu-item {

            float: none;

            border-top: 0 none;

            border-left: 0 none;

            border-bottom: 0 none;
@@ -510,7 +511,9 @@ a.toolbar-menu__trigger, 
    }



    .menu-item .menu-item:hover > .toolbar-icon,

    .menu-item .menu-item:hover > .toolbar-box .toolbar-icon {

    .menu-item .menu-item:focus-within > .toolbar-icon,

    .menu-item .menu-item:hover > .toolbar-box > .toolbar-icon,

    .menu-item .menu-item:focus-within > .toolbar-box > .toolbar-icon {

      color: var(--gin-color-primary-hover);

      background: var(--gin-color-primary-light);

    }