Skip to content

Fix group: sidebar conflicting with Bolt's sidebar #2737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bobdenotter merged 3 commits into from
Aug 5, 2021
Merged

Fix group: sidebar conflicting with Bolt's sidebar #2737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a225ac
Fix `group: sidebar` conflicting with Bolt's sidebar
I-Valchev Jul 29, 2021
5918f06
Put back the sidebar with new selector
I-Valchev Jul 29, 2021
d15000d
Rename tests looking for sidebar
I-Valchev Jul 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/js/app/sidebar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Vue from 'vue';
import store from './store';
import Sidebar from './Components/Sidebar.vue';

const id = 'sidebar';
const id = 'bolt--sidebar';

if (document.getElementById(id)) {
new Vue({
Expand Down
2 changes: 1 addition & 1 deletion templates/_base/layout.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
'action.view': 'action.view'|trans,
}|json_encode %}
<div class="admin__sidebar">
<div class="sidebar sidebar--sticky" id="sidebar">
<div class="sidebar sidebar--sticky" id="bolt--sidebar">
<admin-sidebar
:menu="{{ admin_menu_json }}"
:version="'{{ constant('Bolt\\Version::VERSION')|replace({'alpha': 'α', 'beta': 'β'}) }}'"
Expand Down
18 changes: 9 additions & 9 deletions tests/e2e/record_listing.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ Feature: Record listing

When I hover over the "Tests" element
Then I should see 6 "li" in the 4th ".admin__sidebar--menu ul"
And I should see "New" in the "#sidebar ul li:nth-child(8) ul > li:nth-child(1) > a" element
And I should see "Title of the test" in the "#sidebar ul li:nth-child(8) ul > li:nth-child(2) > a" element
And I should see "New" in the "#bolt--sidebar ul li:nth-child(8) ul > li:nth-child(1) > a" element
And I should see "Title of the test" in the "#bolt--sidebar ul li:nth-child(8) ul > li:nth-child(2) > a" element

@javascript
Scenario: As an admin I want to see the settings menu items
Expand All @@ -92,10 +92,10 @@ Feature: Record listing
Then I should see "Configuration" in the ".admin__sidebar--menu" element

When I hover over the "Configuration" element
Then I should see "Users & Permissions" in the "#sidebar ul > li:nth-child(10) li:nth-child(1)" element
Then I should see "Main Configuration" in the "#sidebar ul > li:nth-child(10) li:nth-child(2)" element
Then I should see "Content Types" in the "#sidebar ul > li:nth-child(10) li:nth-child(3)" element
Then I should see "Taxonomies" in the "#sidebar ul > li:nth-child(10) li:nth-child(4)" element
Then I should see "Menu set up" in the "#sidebar ul > li:nth-child(10) li:nth-child(5)" element
Then I should see "Routing Configuration" in the "#sidebar ul > li:nth-child(10) li:nth-child(6)" element
Then I should see "All Configuration Files" in the "#sidebar ul > li:nth-child(10) li:nth-child(7)" element
Then I should see "Users & Permissions" in the "#bolt--sidebar ul > li:nth-child(10) li:nth-child(1)" element
Then I should see "Main Configuration" in the "#bolt--sidebar ul > li:nth-child(10) li:nth-child(2)" element
Then I should see "Content Types" in the "#bolt--sidebar ul > li:nth-child(10) li:nth-child(3)" element
Then I should see "Taxonomies" in the "#bolt--sidebar ul > li:nth-child(10) li:nth-child(4)" element
Then I should see "Menu set up" in the "#bolt--sidebar ul > li:nth-child(10) li:nth-child(5)" element
Then I should see "Routing Configuration" in the "#bolt--sidebar ul > li:nth-child(10) li:nth-child(6)" element
Then I should see "All Configuration Files" in the "#bolt--sidebar ul > li:nth-child(10) li:nth-child(7)" element