diff --git a/dist/css/base/gin.css b/dist/css/base/gin.css index 258ae1820849f6584242f7f91ba0528c5597a488..0b6294f147ef3045169b08d56f0f4aecaf90d2c4 100644 --- a/dist/css/base/gin.css +++ b/dist/css/base/gin.css @@ -1439,6 +1439,10 @@ table.position-sticky thead { position: static; } +table.position-sticky.--is-processed thead { + pointer-events: none; +} + table.position-sticky.--is-processed thead tr { border-color: transparent; } @@ -1495,7 +1499,7 @@ table .draggable-table.tabledrag-disabled tr { table tr:hover, table .draggable-table.tabledrag-disabled tr:hover { color: var(--gin-color-text); - background: var(--gin-bg-item-hover); + background: var(--gin-bg-item); } table tr.selected:hover, @@ -1508,7 +1512,7 @@ table .draggable-table.tabledrag-disabled tr.selected:hover { } table tr.selected td { - background-color: var(--gin-color-primary-light); + background-color: var(--gin-bg-item-hover); } table td a { @@ -1549,11 +1553,33 @@ table td .group-label { } } +.sortable-heading.is-active > a::before, +.sortable-heading > a:hover::before { + width: 100%; +} + +[dir="ltr"] .sortable-heading.is-active > a::before, +[dir="ltr"] .sortable-heading > a:hover::before { + left: 0; +} + +[dir="rtl"] .sortable-heading.is-active > a::before, +[dir="rtl"] .sortable-heading > a:hover::before { + right: 0; +} + +.sortable-heading > a:hover::before { + border-bottom-width: 3px; +} + .sortable-heading.is-active > a, .sortable-heading.is-active > a:hover, .sortable-heading.is-active > a:active { color: var(--gin-color-primary-active); } .sortable-heading.is-active > a::before { + background-color: var(--gin-bg-item); + border-top-left-radius: var(--gin-border-s); + border-top-right-radius: var(--gin-border-s); border-bottom: .1875rem solid var(--gin-color-primary-active); } diff --git a/dist/css/theme/accent.css b/dist/css/theme/accent.css index 34a74bbea3fde55fb58786c0f220120a35d08580..9f7f9a9fdf98adefd91b4952bdc1def3f7e5780f 100644 --- a/dist/css/theme/accent.css +++ b/dist/css/theme/accent.css @@ -2,6 +2,7 @@ --gin-color-primary: rgb(var(--gin-color-primary-rgb)); --gin-color-primary-light: rgba(var(--gin-color-primary-rgb), .15); --gin-bg-app: rgb(var(--gin-bg-app-rgb)); + --gin-bg-item: rgba(var(--gin-color-primary-rgb), .05); --gin-bg-item-hover: rgba(var(--gin-color-primary-rgb), .1); --gin-color-primary-light-hover: rgba(var(--gin-color-primary-rgb), .2); --gin-color-primary-light-active: rgba(var(--gin-color-primary-rgb), .3); diff --git a/dist/media/sprite.svg b/dist/media/sprite.svg index 45c2b6466c7adb6c20d90f0254362b1121c9cad2..dc6af66074727233c3c526fc9abf586fb5001239 100644 Binary files a/dist/media/sprite.svg and b/dist/media/sprite.svg differ diff --git a/styles/base/_table.scss b/styles/base/_table.scss index b09603d77b6e097fd41ea58581ec5e242d8492b2..da5bd719445db0692473f55e44453bdbed496c32 100644 --- a/styles/base/_table.scss +++ b/styles/base/_table.scss @@ -74,11 +74,15 @@ table.position-sticky { position: static; } - &.--is-processed thead tr { - border-color: transparent; + &.--is-processed thead { + pointer-events: none; - .sortable-heading.is-active > a::before { - display: none; + tr { + border-color: transparent; + + .sortable-heading.is-active > a::before { + display: none; + } } } } @@ -130,7 +134,7 @@ table { &:hover { color: var(--gin-color-text); - background: var(--gin-bg-item-hover); + background: var(--gin-bg-item); } &.selected:hover { @@ -144,7 +148,7 @@ table { } td { - background-color: var(--gin-color-primary-light); + background-color: var(--gin-bg-item-hover); } } @@ -182,12 +186,25 @@ table { } } + &.is-active > a::before, + > a:hover::before { + width: 100%; + left: 0; + } + + > a:hover::before { + border-bottom-width: 3px; + } + &.is-active > a { &, &:hover, &:active { color: var(--gin-color-primary-active); } &::before { + background-color: var(--gin-bg-item); + border-top-left-radius: var(--gin-border-s); + border-top-right-radius: var(--gin-border-s); border-bottom: .1875rem solid var(--gin-color-primary-active); } } diff --git a/styles/helpers/_svg-sprite.scss b/styles/helpers/_svg-sprite.scss index 6f739eb81dee15839f5995d7d2e801042a373762..349e0a6a7d55b32927b1039988a64d4e3caac420 100644 --- a/styles/helpers/_svg-sprite.scss +++ b/styles/helpers/_svg-sprite.scss @@ -59,7 +59,6 @@ $sprites: ( 'user': "../../media/sprite.svg#user-view", 'appearance': "../../media/sprite.svg#appearance-view", 'bat': "../../media/sprite.svg#bat-view", - 'commerce-inbox': "../../media/sprite.svg#commerce-inbox-view", 'commerce': "../../media/sprite.svg#commerce-view", 'config': "../../media/sprite.svg#config-view", 'content': "../../media/sprite.svg#content-view", @@ -320,10 +319,6 @@ $sizes: ( 'width': 24px, 'height': 24px ), - 'commerce-inbox': ( - 'width': 24px, - 'height': 24px - ), 'commerce': ( 'width': 24px, 'height': 24px diff --git a/styles/theme/accent.scss b/styles/theme/accent.scss index 8addb5a7a87d318a9b5425d0c4e44fefa00a13d7..2666422e299f91a75b179bfd574071b628cdb3db 100644 --- a/styles/theme/accent.scss +++ b/styles/theme/accent.scss @@ -2,6 +2,7 @@ --gin-color-primary: rgb(var(--gin-color-primary-rgb)); --gin-color-primary-light: rgba(var(--gin-color-primary-rgb), .15); --gin-bg-app: rgb(var(--gin-bg-app-rgb)); + --gin-bg-item: rgba(var(--gin-color-primary-rgb), .05); --gin-bg-item-hover: rgba(var(--gin-color-primary-rgb), .1); --gin-color-primary-light-hover: rgba(var(--gin-color-primary-rgb), .2); --gin-color-primary-light-active: rgba(var(--gin-color-primary-rgb), .3);