Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 955f411f authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

Merge branch 'dev/fix-nc30-regression' into 'main' 

fix(menu): Fix menu underline and active state as class is changed now with nc30

See merge request !216
parents b244e5cc d37b94c4

core/css/server.css

+25 −17
Original line number Diff line number Diff line
@@ -357,15 +357,15 @@ li.app-navigation-entry.app-navigation-entry--collapsible > a:hover, 
    filter: var(--inactive-icon-filter);

}



#header .app-menu .app-menu-entry.app-menu-entry__active img {

#header .app-menu .app-menu-entry.app-menu-entry--active img {

    filter: var(--active-icon-filter);

}



#header .app-menu .app-menu-entry[data-app-id^='external_index'] img,

#header .app-menu .app-menu-entry.app-menu-entry__active[data-app-id^='external_index'] img {

#header .app-menu .app-menu-entry.app-menu-entry--active[data-app-id^='external_index'] img {

    filter: none;

}

#header .app-menu-main .app-menu-entry.app-menu-entry__active::before {

#header .app-menu__list .app-menu-entry.app-menu-entry--active::before {

    opacity: 0;

}
@@ -1270,10 +1270,10 @@ body.theme--highcontrast #header .app-menu li:hover a .app-menu-entry--label { 
    transform: none;

}



#header .app-menu-main:hover img,

#header .app-menu-main:focus-within img,

#header .app-menu-main .app-menu-entry:hover img,

#header .app-menu-main .app-menu-entry:focus img {

#header .app-menu__list:hover img,

#header .app-menu__list:focus-within img,

#header .app-menu__list .app-menu-entry:hover img,

#header .app-menu__list .app-menu-entry:focus img {

    margin-top: 0px;

}
@@ -1740,7 +1740,7 @@ body.theme--highcontrast svg.material-design-icon__svg { 
    color: var(--color-text-lighter);

}

body.theme--dark #header .app-menu li a,

#header .app-menu-main .app-menu-entry {

#header .app-menu__list .app-menu-entry {

    opacity: 1;

}
@@ -1759,11 +1759,11 @@ body.theme--highcontrast #header .app-menu li a { 
}



#header .app-menu li:hover a,

#header .app-menu li.app-menu-entry__active a {

#header .app-menu li.app-menu-entry--active a {

    opacity: 1;

}



body.theme--highcontrast #header .app-menu li.app-menu-entry__active a {

body.theme--highcontrast #header .app-menu li.app-menu-entry--active a {

    filter: invert(0);

}

body.theme--highcontrast #header .app-menu li .icon-more-white {
@@ -1787,21 +1787,29 @@ body.theme--dark.theme--highcontrast #header .app-menu li:focus a { 
    min-height: 70px;

}



#header-menu-user-menu .header-menu__content .menu-entry img {

#header-menu-user-menu .header-menu__content .account-menu-entry img {

    filter: var(--inactive-icon-filter);

    opacity: 1;

}

#user-menu.user-menu ul li a.active:not(:focus-visible),  

#user-menu.user-menu ul li button.active:not(:focus-visible),

#user-menu.user-menu ul li a:active:not(:focus-visible),

#user-menu.user-menu ul li button.active:not(:focus-visible)

#header-menu-user-menu .header-menu__content .account-menu-entry .list-item-content__name {

    color: var(--color-text-maxcontrast);

}

#header-menu-user-menu .header-menu__content .account-menu-entry.list-item__wrapper--active .list-item {    

    background-color: var(--color-primary-element-light);

    color: var(--color-main-text);

}

#header-menu-user-menu .header-menu__content .account-menu-entry 

#user-menu.account-menu ul li a.active:not(:focus-visible),  

#user-menu.account-menu ul li button.active:not(:focus-visible),

#user-menu.account-menu ul li a:active:not(:focus-visible),

#user-menu.account-menu ul li button.active:not(:focus-visible)

{

    background-color: var(--color-primary-element-light);

    color: var(--color-main-text);

}



#user-menu.user-menu ul li a:focus-visible,  

#user-menu.user-menu ul li button.active:focus-visible {

#user-menu.account-menu ul li a:focus-visible,  

#user-menu.account-menu ul li button.active:focus-visible {

    background-color: var(--color-primary-element-light);

    color: var(--color-main-text);

    box-shadow: none !important;