diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-17 12:42:04 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-18 13:07:05 +0300 |
| commit | dae629e5e9a75ef0594399b46191306dcbaab90b (patch) | |
| tree | 153bc29edb3732c87cfa40faf4ed591b560d4e74 /app/assets | |
| parent | a10cc2202dffcf8b4a7bc7db22757ac83bf95eb4 (diff) | |
fix some inconsistencies with the breadcrumbs
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/breadcrumb.js | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/new_nav.scss | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/app/assets/javascripts/breadcrumb.js b/app/assets/javascripts/breadcrumb.js index 7dfdf844325..97340953c77 100644 --- a/app/assets/javascripts/breadcrumb.js +++ b/app/assets/javascripts/breadcrumb.js @@ -14,7 +14,8 @@ export default () => { topLevelLinks.forEach(el => addTooltipToEl(el)); $expander.closest('.dropdown') - .on('show.bs.dropdown hide.bs.dropdown', () => { - $expander.toggleClass('open'); + .on('show.bs.dropdown hide.bs.dropdown', (e) => { + $('.js-breadcrumbs-collapsed-expander', e.currentTarget).toggleClass('open') + .tooltip('hide'); }); }; diff --git a/app/assets/stylesheets/new_nav.scss b/app/assets/stylesheets/new_nav.scss index b1d1ea1ba5f..8beaf64e7a1 100644 --- a/app/assets/stylesheets/new_nav.scss +++ b/app/assets/stylesheets/new_nav.scss @@ -330,6 +330,7 @@ header.navbar-gitlab-new { .breadcrumbs-list { display: flex; + flex-wrap: wrap; margin-bottom: 0; > li { @@ -338,11 +339,7 @@ header.navbar-gitlab-new { position: relative; &:not(:last-child) { - margin-right: 10px; - } - - &:not(:first-child) { - margin-left: 10px; + margin-right: 20px; } > a { |