diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css index e394014a9..4d69f155f 100644 --- a/modules/backend/assets/css/october.css +++ b/modules/backend/assets/css/october.css @@ -6718,18 +6718,23 @@ nav#layout-mainmenu.navbar ul li.icon i { nav#layout-mainmenu.navbar ul li.icon a { padding: 14px; } -nav#layout-mainmenu.navbar ul li.power-off i { +nav#layout-mainmenu.navbar ul li.power-off i, +nav#layout-mainmenu.navbar ul li.preview i { font-size: 20px; } -nav#layout-mainmenu.navbar ul li.power-off a { +nav#layout-mainmenu.navbar ul li.power-off a, +nav#layout-mainmenu.navbar ul li.preview a { padding: 20px; } nav#layout-mainmenu.navbar ul li.account { margin-right: 0; + line-height: 23px; } nav#layout-mainmenu.navbar ul li.account img { width: 25px; margin-right: 7px; + position: relative; + top: -2px; } nav#layout-mainmenu.navbar ul.nav { display: inline-block; diff --git a/modules/backend/assets/js/october.navbar.js b/modules/backend/assets/js/october.navbar.js index 69c9df06d..eb54b4207 100644 --- a/modules/backend/assets/js/october.navbar.js +++ b/modules/backend/assets/js/october.navbar.js @@ -17,6 +17,10 @@ nav = $('ul.nav', navbar) nav.verticalMenu($('a.menu-toggle', navbar)) + + $('[data-toggle="tooltip"]', navbar).tooltip({ + 'container': 'body' + }) }) }) })(jQuery); \ No newline at end of file diff --git a/modules/backend/assets/less/layout/mainmenu.less b/modules/backend/assets/less/layout/mainmenu.less index d79840e50..ba16611c7 100644 --- a/modules/backend/assets/less/layout/mainmenu.less +++ b/modules/backend/assets/less/layout/mainmenu.less @@ -54,16 +54,20 @@ nav#layout-mainmenu.navbar { a {padding: 14px;} } - &.power-off { + &.power-off, &.preview { i {font-size: 20px;} a {padding: 20px;} } &.account { margin-right: 0; + line-height: 23px; + img { width: 25px; margin-right: 7px; + position: relative; + top: -2px; } } } diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php index d8026d39a..1504c2133 100644 --- a/modules/backend/lang/en/lang.php +++ b/modules/backend/lang/en/lang.php @@ -168,4 +168,7 @@ return [ 'show_gutter' => 'Show gutter', 'theme' => 'Color scheme', ], + 'tooltips' => [ + 'preview_website' => 'Preview the website' + ] ]; diff --git a/modules/backend/layouts/_mainmenu.htm b/modules/backend/layouts/_mainmenu.htm index c88b4d331..9bbbfba43 100644 --- a/modules/backend/layouts/_mainmenu.htm +++ b/modules/backend/layouts/_mainmenu.htm @@ -18,8 +18,12 @@