-
-
- - - = e(trans('backend::lang.account.sign_out')) ?> - - $items): ?> -
- @@ -48,19 +50,17 @@ + + +
- + + = e(trans('backend::lang.account.sign_out')) ?> + +
diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css index 3ba0d1f28..aca75c1ba 100644 --- a/modules/backend/assets/css/october.css +++ b/modules/backend/assets/css/october.css @@ -2283,7 +2283,7 @@ 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.preview i{font-size:20px} nav#layout-mainmenu.navbar ul li.power-off a,nav#layout-mainmenu.navbar ul li.preview a{padding:22px 20px 20px 20px} nav#layout-mainmenu.navbar ul li.account{margin-right:0;line-height:23px} -nav#layout-mainmenu.navbar ul li.account a{padding-left:35px;padding-right:5px;position:relative;z-index:900} +nav#layout-mainmenu.navbar ul li.account a{padding-right:20px;position:relative;z-index:900} 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} nav#layout-mainmenu.navbar .menu-toggle{display:none} @@ -2293,14 +2293,14 @@ nav#layout-mainmenu.navbar .toolbar-item:before{left:-12px} nav#layout-mainmenu.navbar .toolbar-item:after{right:-12px} nav#layout-mainmenu.navbar .toolbar-item.scroll-active-before:before{color:#ffffff} nav#layout-mainmenu.navbar .toolbar-item.scroll-active-after:after{color:#ffffff} -nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu{position:fixed;top:63px;right:0;width:225px;background:#3d3d3d;z-index:900;display:none} +nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu{position:fixed;top:63px;right:0;width:225px;background:#2b3e50;z-index:900;display:none} nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu.active{display:block} -nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu:after{content:'';display:block;width:0;height:0;border-left:11px solid transparent;border-right:11px solid transparent;border-bottom:12px solid #3d3d3d;right:101px;top:-12px;position:absolute} -nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu ul{padding:12px 30px;float:none;display:block} -nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu li{padding:0;font-weight:200;text-align:left;display:block} -nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu li a{display:block;padding:9px 0;text-align:left;opacity:.9} -nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu li a:hover{opacity:.6} -nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu li.divider{height:1px;width:100%;margin:9px 0;overflow:hidden;background-color:transparent;border-top:1px solid #343434} +nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu:after{content:'';display:block;width:0;height:0;border-left:11px solid transparent;border-right:11px solid transparent;border-bottom:12px solid #2b3e50;right:40px;top:-12px;position:absolute} +nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu ul{float:none;display:block} +nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu li{padding:0;margin:0;font-weight:400;text-align:left;display:block} +nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu li a{display:block;padding:12px 30px;text-align:left} +nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu li:hover{background:#3d5265 !important} +nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu li.divider{height:1px;width:100%;background-color:#4b6372} @media (max-width:768px){nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu:after{right:71px} } nav#layout-mainmenu.navbar ul li a,nav#layout-mainmenu .menu-toggle,.mainmenu-collapsed li a{padding:14px 0;display:inline-block;font-size:14px;color:inherit;outline:none} diff --git a/modules/backend/assets/less/core/variables.less b/modules/backend/assets/less/core/variables.less index e7b9175e7..aa772c505 100644 --- a/modules/backend/assets/less/core/variables.less +++ b/modules/backend/assets/less/core/variables.less @@ -64,8 +64,8 @@ @color-mainmenu-active: #ffffff; @color-mainmenu-collapsed: #333333; -@color-accountmenu-bg: #3d3d3d; -@color-accountmenu-divider: #343434; +@color-accountmenu-bg: #2b3e50; +@color-accountmenu-divider: #4b6372; @color-footer: rgba(255,255,255,.8); @color-footer-border: #dfdfdf; diff --git a/modules/backend/assets/less/layout/mainmenu.less b/modules/backend/assets/less/layout/mainmenu.less index 2408ecd12..4c205f731 100644 --- a/modules/backend/assets/less/layout/mainmenu.less +++ b/modules/backend/assets/less/layout/mainmenu.less @@ -64,8 +64,7 @@ nav#layout-mainmenu.navbar { line-height: 23px; a { - padding-left: 35px; - padding-right: 5px; + padding-right: 20px; position: relative; z-index: 900; } @@ -110,41 +109,38 @@ nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu { &:after { .triangle(up, 22px, 12px, @color-accountmenu-bg); - right: 101px; + right: 40px; top: -12px; position: absolute; } ul { - padding: 12px 30px; float: none; display: block; } li { padding: 0; - font-weight: 200; + margin: 0; + font-weight: 400; text-align: left; display: block; a { display: block; - padding: 9px 0; + padding: 12px 30px; text-align: left; - opacity: .9; - &:hover { - opacity: .6; - } + } + + &:hover { + background: #3d5265!important; } } li.divider { height: 1px; width: 100%; - margin: 9px 0; - overflow: hidden; - background-color: transparent; - border-top: 1px solid @color-accountmenu-divider; + background-color: @color-accountmenu-divider; } @media (max-width: @screen-sm) { diff --git a/modules/backend/layouts/_mainmenu.htm b/modules/backend/layouts/_mainmenu.htm index 1081882ae..322d02b79 100644 --- a/modules/backend/layouts/_mainmenu.htm +++ b/modules/backend/layouts/_mainmenu.htm @@ -25,6 +25,14 @@