Skip to content
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

fix styles and icon handling for SS 4 & 5, fixes #51 #52

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix styles and icon handling for SS 4 & 5, fixes #51 #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2aebf1
update styles and icon handling
xini Aug 8, 2024
8135731
run phpcbf
xini Aug 22, 2024
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
97 changes: 92 additions & 5 deletions client/dist/css/GroupedCmsMenu.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,95 @@
padding-left: 8px;
}

.cms-menu__list li a .toggle-children-icon,
.cms-menu__list li a .toggle-children .toggle-children-icon {
background-image: none !important;
top: 35% !important;
}
.cms-menu__list .children > a > .text {
margin-right: 34px;
}

.cms-menu__list li.children.current > a,
.cms-menu__list li.children.opened > a,
.cms-menu__list li.children.opened a:hover {
background-color: #d8e4eb;
}

.cms-menu__list li ul.group {
margin-left: 0;
padding-left: 8px;
}

.cms-menu__list li ul.group li a {
height: auto !important;
}

.cms-menu__list .children a .toggle-children {
position: absolute;
border-radius: 2px;
margin-top: -1px;
padding-top: 0;
font-size: 17px;
text-align: center;
line-height: 26px;
top: 0;
left: 0;
transform: none;
width: 100%;
height: 100%;
right: 0;
bottom: 0;
}

.cms-menu__list .children a .toggle-children:hover {
background: rgba(85, 137, 167, 0.15);
}

.cms-menu__list .children a .toggle-children:before {
font-family: silverstripe!important;
font-style: normal!important;
font-weight: 400!important;
font-variant: normal!important;
text-transform: none!important;
speak: none;
line-height: 26px;
-webkit-font-smoothing: antialiased;
content: '(';
position: absolute;
right: 8px;
top: 50%;
transform: translateY(-50%);
}

.cms-menu__list .children a .toggle-children.opened:before {
content: '*';
}

.cms-menu__list li.children ul.collapsed-flyout {
margin-top: -52px;
}

.cms-menu__list.collapsed .opened .child-flyout-indicator {
display: none !important;
}

.cms-menu__list.collapsed .opened ul.collapsed-flyout li.clone {
display: none !important;
}

.cms-menu__list.collapsed .opened ul.collapsed-flyout li a {
padding-right: 8px;
padding-left: 8px;
}

.cms-menu__list.collapsed .opened ul.collapsed-flyout li a .menu__icon {
left: 13px;
}

.cms-menu__list.collapsed .opened ul.collapsed-flyout li a span.text {
margin-left: 23px;
}

.cms-menu__list .child-flyout-indicator {
display: none !important;
}

.cms-menu__list .toggle-children-icon {
display: none !important;
}
5 changes: 2 additions & 3 deletions src/Admin/GroupedCmsMenu.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public function GroupedMainMenu()
$result->push(ArrayData::create([
'Title' => $this->getTitle($group, $code),
'IconClass' => $iconClass,
'HasCSSIcon' => strtolower($code),
'HasCSSIcon' => false,
'Code' => DBField::create_field(DBText::class, $code),
'Link' => $children->first()->Link,
'LinkingMode' => $active ? 'current' : 'link',
Expand Down Expand Up @@ -171,7 +171,7 @@ public function getIcon($group, $code)
return $class::create()->config()->get('menu_icon_class');
}

return 'font-icon-' . (!empty($groupSettings[$group]['icon']) ? $groupSettings[$group]['icon'] : '');
return (!empty($groupSettings[$group]['icon']) ? 'font-icon-' . $groupSettings[$group]['icon'] : '');
}

/**
Expand Down Expand Up @@ -221,5 +221,4 @@ public function filterChildren(SS_List $children)
$filtered->sort('ChildTitle') :
$filtered->sort('SortOrder');
}

}