diff --git a/src/AutoConnectAux.cpp b/src/AutoConnectAux.cpp index 691d5d4..080218d 100644 --- a/src/AutoConnectAux.cpp +++ b/src/AutoConnectAux.cpp @@ -328,7 +328,7 @@ const String AutoConnectAux::_injectMenu(PageArgument& args) { String menuItem; if (_menu) - menuItem = String(FPSTR("
  • ") + _title + String(FPSTR("
  • ")); + menuItem = String(FPSTR("
  • ") + _title + String(FPSTR("
  • ")); if (_next) menuItem += _next->_injectMenu(args); return menuItem; diff --git a/src/AutoConnectPage.cpp b/src/AutoConnectPage.cpp index b1bce60..94bf224 100644 --- a/src/AutoConnectPage.cpp +++ b/src/AutoConnectPage.cpp @@ -326,7 +326,7 @@ const char AutoConnect::_CSS_SPINNER[] PROGMEM = { /**< Common menu bar. This style quotes LuxBar. */ /**< balzss/luxbar is licensed under the MIT License https://github.com/balzss/luxbar */ const char AutoConnect::_CSS_LUXBAR[] PROGMEM = { - ".luxbar-fixed{" + ".lb-fixed{" "width:100%;" "position:fixed;" "top:0;" @@ -334,84 +334,84 @@ const char AutoConnect::_CSS_LUXBAR[] PROGMEM = { "z-index:1000;" "box-shadow:0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);" "}" - ".luxbar-burger span," - ".luxbar-burger span::before," - ".luxbar-burger span::after{" + ".lb-burger span," + ".lb-burger span::before," + ".lb-burger span::after{" "display:block;" "height:2px;" "width:26px;" "transition:0.6s ease;" "}" - ".luxbar-checkbox:checked~.luxbar-menu li .luxbar-burger span{" + ".lb-cb:checked~.lb-menu li .lb-burger span{" "background-color:transparent;" "}" - ".luxbar-checkbox:checked~.luxbar-menu li .luxbar-burger span::before," - ".luxbar-checkbox:checked~.luxbar-menu li .luxbar-burger span::after{" + ".lb-cb:checked~.lb-menu li .lb-burger span::before," + ".lb-cb:checked~.lb-menu li .lb-burger span::after{" "margin-top:0;" "}" - ".luxbar-header{" + ".lb-header{" "display:flex;" "flex-direction:row;" "justify-content:space-between;" "align-items:center;" "height:58px;" "}" - ".luxbar-menu-right .luxbar-burger{" + ".lb-menu-right .lb-burger{" "margin-left:auto;" "}" - ".luxbar-brand{" + ".lb-brand{" "font-size:1.6em;" "padding:18px 24px 18px 24px;" "}" - ".luxbar-menu{" + ".lb-menu{" "min-height:58px;" "transition:0.6s ease;" "width:100%;" "}" - ".luxbar-navigation{" + ".lb-navigation{" "display:flex;" "flex-direction:column;" "list-style:none;" "padding-left:0;" "margin:0;" "}" - ".luxbar-menu a," - ".luxbar-item a{" + ".lb-menu a," + ".lb-item a{" "text-decoration:none;" "color:inherit;" "cursor:pointer;" "}" - ".luxbar-item{" + ".lb-item{" "height:58px;" "}" - ".luxbar-item a{" + ".lb-item a{" "padding:18px 24px 18px 24px;" "display:block;" "}" - ".luxbar-burger{" + ".lb-burger{" "padding:18px 24px 18px 24px;" "position:relative;" "cursor:pointer;" "}" - ".luxbar-burger span::before," - ".luxbar-burger span::after{" + ".lb-burger span::before," + ".lb-burger span::after{" "content:'';" "position:absolute;" "}" - ".luxbar-burger span::before{" + ".lb-burger span::before{" "margin-top:-8px;" "}" - ".luxbar-burger span::after{" + ".lb-burger span::after{" "margin-top:8px;" "}" - ".luxbar-checkbox{" + ".lb-cb{" "display:none;" "}" - ".luxbar-checkbox:not(:checked)~.luxbar-menu{" + ".lb-cb:not(:checked)~.lb-menu{" "overflow:hidden;" "height:58px;" "}" - ".luxbar-checkbox:checked~.luxbar-menu{" + ".lb-cb:checked~.lb-menu{" "transition:height 0.6s ease;" "height:100vh;" "overflow:auto;" @@ -441,34 +441,34 @@ const char AutoConnect::_CSS_LUXBAR[] PROGMEM = { "list-style:none;" "padding:0;" "}" - ".dropdown>ul .luxbar-item{" + ".dropdown>ul .lb-item{" "min-width:100%;" "height:29px;" "padding:5px 10px 5px 40px;" "}" - ".dropdown>ul .luxbar-item a{" + ".dropdown>ul .lb-item a{" "min-height:29px;" "line-height:29px;" "padding:0;" "}" "@media screen and (min-width:768px){" - ".luxbar-navigation{" + ".lb-navigation{" "flex-flow:row;" "justify-content:flex-end;" "}" - ".luxbar-burger{" + ".lb-burger{" "display:none;" "}" - ".luxbar-checkbox:not(:checked)~.luxbar-menu{" + ".lb-cb:not(:checked)~.lb-menu{" "overflow:visible;" "}" - ".luxbar-checkbox:checked~.luxbar-menu{" + ".lb-cb:checked~.lb-menu{" "height:58px;" "}" - ".luxbar-menu .luxbar-item{" + ".lb-menu .lb-item{" "border-top:0;" "}" - ".luxbar-menu-right .luxbar-header{" + ".lb-menu-right .lb-header{" "margin-right:auto;" "}" ".dropdown{" @@ -483,31 +483,31 @@ const char AutoConnect::_CSS_LUXBAR[] PROGMEM = { ".dropdown>ul{" "display:none;" "}" - ".dropdown>ul .luxbar-item{" + ".dropdown>ul .lb-item{" "padding:5px 10px;" "}" - ".dropdown>ul .luxbar-item a{" + ".dropdown>ul .lb-item a{" "white-space:nowrap;" "}" "}" - ".luxbar-checkbox:checked+.luxbar-menu .luxbar-burger-doublespin span::before{" + ".lb-cb:checked+.lb-menu .lb-burger-doublespin span::before{" "transform:rotate(225deg);" "}" - ".luxbar-checkbox:checked+.luxbar-menu .luxbar-burger-doublespin span::after{" + ".lb-cb:checked+.lb-menu .lb-burger-doublespin span::after{" "transform:rotate(-225deg);" "}" - ".luxbar-menu-material," - ".luxbar-menu-material .dropdown ul{" + ".lb-menu-material," + ".lb-menu-material .dropdown ul{" "background-color:" AUTOCONNECT_MENUCOLOR_BACKGROUND ";" "color:" AUTOCONNECT_MENUCOLOR_TEXT "}" - ".luxbar-menu-material .active," - ".luxbar-menu-material .luxbar-item:hover{" + ".lb-menu-material .active," + ".lb-menu-material .lb-item:hover{" "background-color:" AUTOCONNECT_MENUCOLOR_ACTIVE "}" - ".luxbar-menu-material .luxbar-burger span," - ".luxbar-menu-material .luxbar-burger span::before," - ".luxbar-menu-material .luxbar-burger span::after{" + ".lb-menu-material .lb-burger span," + ".lb-menu-material .lb-burger span::before," + ".lb-menu-material .lb-burger span::after{" "background-color:" AUTOCONNECT_MENUCOLOR_TEXT "}" }; @@ -522,18 +522,18 @@ const char AutoConnect::_ELM_HTML_HEAD[] PROGMEM = { /**< LuxBar menu element. */ const char AutoConnect::_ELM_MENU_PRE[] PROGMEM = { - "
    " - "" - "
    " - "