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

[4.0] Sidebar - switch to vertical collapsing #22587

Merged
merged 26 commits into from
Oct 18, 2018
Merged

[4.0] Sidebar - switch to vertical collapsing #22587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
1b28884
[4.0] Sidebar redo
ciar4n Oct 11, 2018
c48a0e8
happy hound
ciar4n Oct 11, 2018
3129b30
more hound
ciar4n Oct 11, 2018
86f02c2
Fix current and toggle
ciar4n Oct 12, 2018
85eccfc
Increase parent hover contrast
ciar4n Oct 12, 2018
1e524d0
cs
ciar4n Oct 12, 2018
52decbe
a11y styling
ciar4n Oct 12, 2018
c85453d
happy hound
ciar4n Oct 12, 2018
c663ffd
hound
ciar4n Oct 12, 2018
4a084b6
list style - switch to data uri icons
ciar4n Oct 12, 2018
933f94d
hound
ciar4n Oct 12, 2018
0371309
hound
ciar4n Oct 12, 2018
b9c3e05
invalid property
ciar4n Oct 12, 2018
f52935f
Remove 'add new menu'
ciar4n Oct 14, 2018
1e47756
hound
ciar4n Oct 14, 2018
5177d90
remove redundant js
ciar4n Oct 14, 2018
8480c94
hound
ciar4n Oct 14, 2018
afebfbe
es5
ciar4n Oct 16, 2018
d6ca43f
cs
ciar4n Oct 16, 2018
7b4cc7d
conflicts
ciar4n Oct 16, 2018
9d920f0
cs
ciar4n Oct 16, 2018
cc01498
Merge branch '4.0-dev' into metismenujs
ciar4n Oct 16, 2018
2d5b270
Update default.php
laoneo Oct 16, 2018
c053ed5
Merge branch '4.0-dev' into metismenujs
laoneo Oct 16, 2018
9d68fff
Open second level if active
ciar4n Oct 16, 2018
d69c02c
Merge branch 'metismenujs' of https://github.com/ciar4n/joomla-cms in…
ciar4n Oct 16, 2018
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
7 changes: 0 additions & 7 deletions administrator/components/com_menus/presets/joomla.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,6 @@
type="component"
element="com_menus"
link="index.php?option=com_menus&view=menus">
<menuitem
title="MOD_MENU_MENU_MANAGER_NEW_MENU"
type="component"
element="com_menus"
link="index.php?option=com_menus&amp;view=menu&amp;layout=edit"
scope="edit"
/>
</menuitem>
<menuitem
type="separator"
Expand Down
3 changes: 2 additions & 1 deletion administrator/modules/mod_menu/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;

HTMLHelper::_('script', 'vendor/metismenujs/metismenujs.min.js', ['version' => 'auto', 'relative' => true]);
HTMLHelper::_('script', 'mod_menu/admin-menu.min.js', ['version' => 'auto', 'relative' => true], ['defer' => true]);

$doc = \Joomla\CMS\Factory::getDocument();
$direction = $doc->direction === 'rtl' ? 'float-right' : '';
$class = $enabled ? 'nav navbar-nav nav-stacked main-nav clearfix ' . $direction : 'nav navbar-nav nav-stacked main-nav clearfix disabled ' . $direction;
$class = $enabled ? 'nav flex-column main-nav ' . $direction : 'nav flex-column main-nav disabled ' . $direction;

// Recurse through children of root node if they exist
$menuTree = $menu->getTree();
Expand Down
7 changes: 3 additions & 4 deletions administrator/modules/mod_menu/tmpl/default_submenu.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@

if ($current->hasChildren())
{
$linkClass[] = 'collapse-arrow';
$linkClass[] = 'has-arrow';

if ($current->getLevel() > 2)
{
Expand Down Expand Up @@ -112,12 +112,11 @@
{
$id = $current->get('id') ? ' id="menu-' . strtolower($current->get('id')) . '"' : '';

echo '<ul' . $id . ' class="nav panel-collapse collapse collapse-level-' . $current->getLevel() . '">' . "\n";
echo '<ul' . $id . ' class="collapse collapse-level-' . $current->getLevel() . '">' . "\n";
}
else
{
echo '<ul id="collapse' . $this->tree->getCounter() . '" class="nav panel-collapse collapse-level-1 collapse" role="menu" aria-hidden="true">
<li>' . Text::_($current->get('title')) . '<a href="#" class="close"><span aria-label="' . Text::_('MOD_MENU_ARIA_CLOSE_SUBMENU') . '">×</span></a></li>' . "\n";
echo '<ul id="collapse' . $this->tree->getCounter() . '" class="collapse-level-1 collapse" role="menu" aria-hidden="true">' . "\n";
}

// WARNING: Do not use direct 'include' or 'require' as it is important to isolate the scope for each call
Expand Down
9 changes: 7 additions & 2 deletions administrator/templates/atum/scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,14 @@ $atum-toolbar-line-height: 2.3rem;
// Sidebar
$atum-level-1-bg: rgba($black, .65);
$atum-level-2-bg: rgba($black, .05);
$sidebar-bg: #122942;
$sidebar-width: 250px;
$sidebar-width-closed: 64px;
$main-brand-height: 50px;
$sidebar-width-closed: 48px;
$sidebar-sub-bg: #1b3654;
$sidebar-text-color: #7189a4;
$sidebar-link-color: #e3eaf1;
$sidebar-child-link-color: #cbd6e2;
$main-brand-height: 48px;

// Fonts
$font-family-base: Arial, sans-serif;
Expand Down
Loading