TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added new Inline (no icons) navigation mode to the branding options

This commit is contained in:
Luke Towers 2019-02-13 14:55:03 -06:00
parent cb87802080
commit c55cc622ff
4 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
modules/backend/assets/css/october.css
View File

@ -703,18 +703,31 @@ nav#layout-mainmenu ul li .mainmenu-accountmenu li:first-child a:focus:after,
nav#layout-mainmenu ul li .mainmenu-accountmenu li:first-child a:active:after {content:'';display:block;width:0;height:0;border-left:8.5px solid transparent;border-right:8.5px solid transparent;border-bottom:7px solid #4ea5e0;position:absolute;right:9px;top:-7px;z-index:102}
nav#layout-mainmenu ul li .mainmenu-accountmenu li:first-child a:active:after {content:'';display:block;width:0;height:0;border-left:8.5px solid transparent;border-right:8.5px solid transparent;border-bottom:7px solid #3498db}
nav#layout-mainmenu ul li .mainmenu-accountmenu li.divider {height:1px;width:100%;background-color:#e0e0e0}
nav#layout-mainmenu.navbar-mode-inline {height:60px}
nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-toolbar li.mainmenu-preview a {height:60px;line-height:60px}
nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-toolbar li.mainmenu-account >a {height:60px;line-height:60px}
nav#layout-mainmenu.navbar-mode-inline ul li .mainmenu-accountmenu {top:70px}
nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li {margin:5px 0}
nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li a {padding:10px 15px}
nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li a .nav-icon {position:relative;top:-1px;margin-right:5px;width:30px;height:30px}
nav#layout-mainmenu.navbar-mode-inline,
nav#layout-mainmenu.navbar-mode-inline_no_icons {height:60px}
nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-toolbar li.mainmenu-preview a,
nav#layout-mainmenu.navbar-mode-inline_no_icons ul.mainmenu-toolbar li.mainmenu-preview a {height:60px;line-height:60px}
nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-toolbar li.mainmenu-account >a,
nav#layout-mainmenu.navbar-mode-inline_no_icons ul.mainmenu-toolbar li.mainmenu-account >a {height:60px;line-height:60px}
nav#layout-mainmenu.navbar-mode-inline ul li .mainmenu-accountmenu,
nav#layout-mainmenu.navbar-mode-inline_no_icons ul li .mainmenu-accountmenu {top:70px}
nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li,
nav#layout-mainmenu.navbar-mode-inline_no_icons ul.mainmenu-nav li {margin:5px 0}
nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li a,
nav#layout-mainmenu.navbar-mode-inline_no_icons ul.mainmenu-nav li a {padding:10px 15px}
nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li a .nav-icon,
nav#layout-mainmenu.navbar-mode-inline_no_icons ul.mainmenu-nav li a .nav-icon {position:relative;top:-1px;margin-right:5px;width:30px;height:30px}
nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li a .nav-icon i,
nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li a .nav-icon img {margin:0}
nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li a .nav-label {line-height:30px}
nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li:first-child {margin-left:-13px}
nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li:last-child {margin-right:0}
nav#layout-mainmenu.navbar-mode-inline_no_icons ul.mainmenu-nav li a .nav-icon i,
nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li a .nav-icon img,
nav#layout-mainmenu.navbar-mode-inline_no_icons ul.mainmenu-nav li a .nav-icon img {margin:0}
nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li a .nav-label,
nav#layout-mainmenu.navbar-mode-inline_no_icons ul.mainmenu-nav li a .nav-label {line-height:30px}
nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li:first-child,
nav#layout-mainmenu.navbar-mode-inline_no_icons ul.mainmenu-nav li:first-child {margin-left:-13px}
nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li:last-child,
nav#layout-mainmenu.navbar-mode-inline_no_icons ul.mainmenu-nav li:last-child {margin-right:0}
nav#layout-mainmenu.navbar-mode-inline_no_icons .nav-icon {display:none !important}
nav#layout-mainmenu.navbar-mode-tile {height:78px}
nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-toolbar li.mainmenu-preview a {height:78px;line-height:78px}
nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-toolbar li.mainmenu-account >a {height:78px;line-height:78px}

14
modules/backend/assets/less/layout/mainmenu.less
View File

@ -149,10 +149,6 @@ nav#layout-mainmenu {
top: 0;
}
}
&.active a {
// font-weight: bold;
}
}
&.nav {
@ -351,7 +347,8 @@ nav#layout-mainmenu ul li .mainmenu-accountmenu {
// Navbar (Inline mode)
//
nav#layout-mainmenu.navbar-mode-inline {
nav#layout-mainmenu.navbar-mode-inline,
nav#layout-mainmenu.navbar-mode-inline_no_icons {
.mainmenu-set-height(@mainmenu-mode-inline-height);
ul.mainmenu-nav {
@ -394,6 +391,13 @@ nav#layout-mainmenu.navbar-mode-inline {
}
}
//
// Navbar (Inline no icons mode)
//
nav#layout-mainmenu.navbar-mode-inline_no_icons .nav-icon {
display: none !important;
}
//
// Navbar (Tiles mode)
//

1
modules/backend/lang/en/lang.php
View File

@ -442,6 +442,7 @@ return [
'navigation' => 'Navigation',
'menu_mode' => 'Menu style',
'menu_mode_inline' => 'Inline',
'menu_mode_inline_no_icons' => 'Inline (no icons)',
'menu_mode_tile' => 'Tiles',
'menu_mode_collapsed' => 'Collapsed'
],

1
modules/backend/models/brandsetting/fields.yaml
View File

@ -63,6 +63,7 @@ tabs:
type: radio
options:
inline: backend::lang.branding.menu_mode_inline
inline_no_icons: backend::lang.branding.menu_mode_inline_no_icons
tile: backend::lang.branding.menu_mode_tile
collapse: backend::lang.branding.menu_mode_collapsed