Index: lams_central/web/css/components.css =================================================================== diff -u -r989f22a0c998fff45aabca43d753612f0d8e4358 -rccc1c4ab6e987bbf3680c88de5eca4ab1eb38bc7 --- lams_central/web/css/components.css (.../components.css) (revision 989f22a0c998fff45aabca43d753612f0d8e4358) +++ lams_central/web/css/components.css (.../components.css) (revision ccc1c4ab6e987bbf3680c88de5eca4ab1eb38bc7) @@ -279,14 +279,19 @@ transform: translateX(-7rem); } +.component-sidebar .component-menu-btn a { + margin-bottom: 1rem; +} + .component-sidebar > ul { list-style: none; padding: 0; margin: 0; margin-bottom: auto; } -.component-sidebar .logo-li { +.component-sidebar .logo-li, +.component-sidebar .lams-logo { margin-bottom: 4rem; } @@ -358,27 +363,39 @@ display: flex; } -.component-page-wrapper .top-menu-btn a { +.component-page-wrapper .component-menu-btn a { + color: #fff; display: inline-block; background-color: #3C42E0; width: 3.1rem; height: 3.1rem; border-radius: 1rem; - margin-left: .6rem; text-align: center; line-height: 2.8rem; box-shadow: 0px 3px 6px #3C42E040; transition: all .3s ease; } -.component-page-wrapper .top-menu-btn a:hover { +.component-page-wrapper .component-menu-btn a i.fa { + padding-top: 1.5rem; +} + +.component-page-wrapper .component-menu-btn a.active { background-color: #878bea; } -.component-page-wrapper .top-menu-btn a img { +.component-page-wrapper .component-menu-btn a:hover { + background-color: #878bea; +} + +.component-page-wrapper .component-menu-btn a img { width: 1rem; } +.component-page-wrapper .top-menu a { + margin-left: .6rem; +} + .component-page-wrapper .top-menu form { position: relative; width: 18.8rem; Index: lams_monitoring/web/css/components-monitoring.css =================================================================== diff -u -rdec809c7a193cb1e2ba92e718ba5daa48d4c2ad5 -rccc1c4ab6e987bbf3680c88de5eca4ab1eb38bc7 --- lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision dec809c7a193cb1e2ba92e718ba5daa48d4c2ad5) +++ lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision ccc1c4ab6e987bbf3680c88de5eca4ab1eb38bc7) @@ -46,6 +46,7 @@ padding-left: 4.8rem; } +/* .monitoring-page-wrapper .component-sidebar .menu-li a svg .c, .monitoring-page-wrapper .component-sidebar .menu-li a svg .d, .monitoring-page-wrapper .component-sidebar .menu-li a svg rect { @@ -103,41 +104,12 @@ { fill: #3C42E0; } +*/ .monitoring-page-wrapper .top-menu-btn a:nth-child(3) img { width: 1.3rem; } -/* User icon in left lower corner - unused? -.user-col { - position: relative; - cursor: pointer; - width: 3rem; - margin: 0 auto; - max-width: 100%; -} - -.user-col img { - width: 100%; -} - -.user-col span { - width: 7px; - height: 7px; - border-radius: 50%; - background-color: #3C42E0; - display: inline-block; - position: absolute; - border: 1px solid #fff; - top: 1px; - right: 2px; - display: none; -} - -.user-col.active span { - display: block; -} -*/ .monitoring-page-wrapper .content-left { -ms-flex: 0 0 26.5rem; flex: 0 0 26.5rem; Index: lams_monitoring/web/monitor5.jsp =================================================================== diff -u -r88eedf31578e0a0607d0e3f849730e1599d42597 -rccc1c4ab6e987bbf3680c88de5eca4ab1eb38bc7 --- lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision 88eedf31578e0a0607d0e3f849730e1599d42597) +++ lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision ccc1c4ab6e987bbf3680c88de5eca4ab1eb38bc7) @@ -215,30 +215,18 @@
-