diff --git a/CHANGELOG.md b/CHANGELOG.md index 30babd9e3..afb7ad001 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ Releases are recorded as git tags in the [Github releases](https://github.com/learningequality/kolibri-design-system/releases) page. +## Version 1.4.x +- [#185] - Handle arrow key navigation and improve focusOutline +- [#338] - Allow for new 'nav' slot inline in the toolbar + + ## Version 1.3.1 - [#309] - Add jest testing environment to KDS diff --git a/lib/keen/UiToolbar.vue b/lib/keen/UiToolbar.vue index 838c65fee..7b2d5cd0f 100644 --- a/lib/keen/UiToolbar.vue +++ b/lib/keen/UiToolbar.vue @@ -23,16 +23,16 @@ - - -
+ + @@ -134,9 +134,12 @@ .ui-toolbar { position: relative; display: flex; + align-content: center; align-items: center; + justify-content: space-between; height: $ui-toolbar-height; padding-left: rem(16px); + max-width: 100%; font-family: inherit; font-size: $ui-toolbar-font-size; @@ -155,9 +158,7 @@ } .ui-toolbar__left { - display: flex; - flex-shrink: 0; - align-items: center; + display: inline-flex; } .ui-toolbar__nav-icon { @@ -165,6 +166,14 @@ margin-left: rem(-16px); } + .ui-toolbar__nav { + margin-right: rem(8px); + margin-left: rem(-16px); + display: flex; + align-items: bottom; + margin-left: 16px; + } + .ui-toolbar__brand { min-width: rem(160px); } @@ -175,8 +184,6 @@ } .ui-toolbar__body { - display: flex; - flex-grow: 1; &.has-brand-divider { padding-left: rem(24px); @@ -186,8 +193,7 @@ } .ui-toolbar__right { - flex-shrink: 0; - margin-left: auto; + display: inline-block; } .ui-toolbar__progress {