Commit 1a80cd4d authored by Sascha Eggenberger's avatar Sascha Eggenberger
Browse files

Issue #3358694: Displaying same icon for 'Add to shortcuts' and 'Remove from shortcuts'

parent a4e6229c

dist/css/base/gin.css

+6 −7
Original line number Diff line number Diff line
@@ -586,12 +586,9 @@ body:not(.toolbar-tray-open) .layout-container { 
}



.shortcut-action--remove .shortcut-action__icon {

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

}



.gin--high-contrast-mode .shortcut-action--remove .shortcut-action__icon {

  -webkit-mask-image: url("../../media/sprite.svg#shortcut-filled-view");

          mask-image: url("../../media/sprite.svg#shortcut-filled-view");

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

}



.shortcut-action--remove:hover .shortcut-action__icon {
@@ -600,10 +597,12 @@ body:not(.toolbar-tray-open) .layout-container { 
}



.shortcut-action__message {

  z-index: 2;

  position: absolute;

  top: calc(100% + var(--gin-spacing-xs));

  top: 0;

  min-width: 120px;

  pointer-events: none;

  white-space: nowrap;

  padding: var(--gin-spacing-xs);

  margin-top: calc(var(--gin-spacing-xxs) * -1);

  color: var(--gin-color-contextual-text);
@@ -612,11 +611,11 @@ body:not(.toolbar-tray-open) .layout-container { 
}



[dir="ltr"] .shortcut-action__message {

  right: 0;

  left: 100%;

}



[dir="rtl"] .shortcut-action__message {

  left: 0;

  right: 100%;

}



.modules-table-filter {

dist/css/layout/classic_toolbar.css

+2 −1
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ 
}



.toolbar .toolbar-menu,

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

.toolbar-horizontal .menu-item > .toolbar-menu,

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

.toolbar .toolbar-tray {

  background-color: var(--gin-bg-layer);

}

dist/media/sprite.svg

+0 −0

File changed.

Preview suppressed by a .gitattributes entry or the file's encoding is unsupported.

View original file
View changed file

media/icons/toolbar-meta/shortcut-filled.svg

+0 −0

File changed.

Preview suppressed by a .gitattributes entry or the file's encoding is unsupported.

View original file
View changed file

styles/base/_title.scss

+5 −6
Original line number Diff line number Diff line
@@ -74,11 +74,8 @@ 


  &--remove {

    .shortcut-action__icon {

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



      .gin--high-contrast-mode & {

      mask-image: icon('shortcut-filled');

      }

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

    }



    &:hover .shortcut-action__icon {
@@ -88,11 +85,13 @@ 
  }



  &__message {

    z-index: 2;

    position: absolute;

    top: calc(100% + var(--gin-spacing-xs));

    right: 0;

    top: 0;

    left: 100%;

    min-width: 120px;

    pointer-events: none;

    white-space: nowrap;

    padding: var(--gin-spacing-xs);

    margin-top: calc(var(--gin-spacing-xxs) * -1);

    color: var(--gin-color-contextual-text);