diff --git a/resource/static/theme-server-status/css/dark.css b/resource/static/theme-server-status/css/dark.css index 7748a225bb..d5e8003a26 100644 --- a/resource/static/theme-server-status/css/dark.css +++ b/resource/static/theme-server-status/css/dark.css @@ -1,5 +1,6 @@ body[theme="dark"] { - background: #31363b; + font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; + background: rgba(49, 54, 59, 1); color: #f1f1f1; } @@ -7,14 +8,10 @@ body[theme="dark"] .navbar .navbar-brand { color: #ffffff; } -body[theme="dark"] .navbar .navbar-brand { - color: #ffffff; -} - body[theme="dark"] .navbar .dropdown-menu { list-style-image: initial; - background-color: #171a1e; - border-color: #31363b; + background-color: rgba(23, 26, 30, 1); + border-color: rgba(49, 54, 59, 1); box-shadow: rgba(0, 0, 0, 0.18) 0px 6px 12px; } @@ -24,8 +21,8 @@ body[theme="dark"] .navbar .dropdown-menu > li > a { body[theme="dark"] .navbar .dropdown-menu > li > a:focus, body[theme="dark"] .navbar .dropdown-menu > li > a:hover { - background-color: #25282a; - background-image: linear-gradient(#1c1d26 0, #1c1d26 100%); + background-color: rgba(37, 40, 42, 1); + background-image: linear-gradient(rgba(28, 29, 38, 1) 0, rgba(28, 29, 38, 1) 100%); } body[theme="dark"] .navbar .navbar-nav > .open > a:focus, @@ -37,18 +34,13 @@ body[theme="dark"] .navbar .navbar-nav > .open > a{ background-color: transparent !important; } -body[theme="dark"] .navbar .navbar-nav .open .dropdown-menu>li>a { +body[theme="dark"] .navbar .navbar-nav .open .dropdown-menu > li > a { color: #f1f1f1; } -body[theme="dark"] .toolbox i{ - color: rgba(241,241,241,1); - background-color: rgba(0,0,0,0.5); -} - body[theme="dark"] .content { background-image: initial; - background-color: #1c1d26; + background-color: rgba(28, 29, 38, 1); border: none; box-shadow: rgba(0, 0, 0, 0.5) 0 0.625em 2em; -webkit-box-shadow: rgba(0, 0, 0, 0.5) 0 0.625em 2em; @@ -57,31 +49,56 @@ body[theme="dark"] .content { body[theme="dark"] .table { background-image: initial; - background-color: #1c1d26; + background-color: rgba(28, 29, 38, 1); border-color: #545b5e; } -body[theme="dark"] .table>thead>tr.node-group-tag>th { - background-color: #1c1d26; +body[theme="dark"] .table > tbody > tr > td:before, +body[theme="dark"] .table > tfoot > tr > td:before, +body[theme="dark"] .table > thead > tr > td:before, +body[theme="dark"] .table > thead > tr.node-group-cell > th:before{ + background-color: rgba(58, 62, 65, 1); } +body[theme="dark"] .table-striped tbody > tr, body[theme="dark"] .table-striped tbody > tr.even > td, body[theme="dark"] .table-striped tbody > tr.even > th { - background-color: #1c1d26; + background-color: rgba(28, 29, 38, 1); } +body[theme="dark"] .table-striped tbody > tr, body[theme="dark"] .table-striped tbody > tr.odd > td, body[theme="dark"] .table-striped tbody > tr.odd > th { - background-color: #1c1d26; + /* background-color: rgba(28, 29, 38, 1); 282B2E*/ + background-color: rgba(34, 35, 46, 1); +} + +body[theme="dark"] .table-hover > tbody > tr:hover{ + background-color: unset; +} + +body[theme="dark"] .table-hover > tbody > tr:not(.expandRow):hover > td { + background-color: rgba(48, 50, 65, 1); +} + +/* expandRow展开部分样式 */ +body[theme="dark"] .table > tbody > tr.expandRow.odd > td:before{ + /* background-color: rgba(28, 29, 38, 1); 282B2E*/ + background-color: rgba(34, 35, 46, 1); } +body[theme="dark"] .table > tbody > tr.expandRow.even > td:before{ + background-color: rgba(28, 29, 38, 1); +} +/* expandRow展开部分样式结束 */ + body[theme="dark"] .progress { - background-image: linear-gradient(#2c2c2c 0,#1c1d26 100%); - background-color: #1c1d26; + background-image: linear-gradient(#2c2c2c 0,rgba(28, 29, 38, 1) 100%); + background-color: rgba(28, 29, 38, 1); } body[theme="dark"] .progress-bar { - color: white; + color: #ffffff; } body[theme="dark"] .progress-bar-success { @@ -89,7 +106,7 @@ body[theme="dark"] .progress-bar-success { } body[theme="dark"] .progress-offline .progress-bar-success { - background-image: linear-gradient(grey 0, grey 100%); + background-image: linear-gradient(#808080 0, #808080 100%); } body[theme="dark"] .progress-bar-warning { @@ -97,7 +114,7 @@ body[theme="dark"] .progress-bar-warning { } body[theme="dark"] .progress-offline .progress-bar-warning { - background-image: linear-gradient(grey 0, grey 100%); + background-image: linear-gradient(#808080 0, #808080 100%); } body[theme="dark"] .progress-bar-danger { @@ -105,27 +122,7 @@ body[theme="dark"] .progress-bar-danger { } body[theme="dark"] .progress-offline .progress-bar-danger { - background-image: linear-gradient(grey 0, grey 100%); -} - -body[theme="dark"] .table > tbody > tr > td:before, -body[theme="dark"] .table > tfoot > tr > td:before, -body[theme="dark"] .table > thead > tr > td:before, -body[theme="dark"] .table > thead > tr.node-group-cell > th:before{ - background-color: rgba(58, 62, 65, 1); -} - -body[theme="dark"] .table > tbody > tr.expandRow > td:before, -body[theme="dark"] .table > thead > tr.node-group-tag > th:before{ - background-color: #1c1d26; -} - -body[theme="dark"] .table-hover > tbody > tr:not(.expandRow):hover > td { - background-color: #171a1e; -} - -body[theme="dark"] .table-striped > tbody > tr:nth-of-type(2n+1) { - background-color: #1c1d26; + background-image: linear-gradient(#808080 0, #808080 100%); } body[theme="dark"] .node-cell.status .status-icon.online { @@ -149,7 +146,7 @@ body[theme="dark"] .service-status .warning { } body[theme="dark"] .service-day-status-icon { - background-color: grey; + background-color: rgba(128, 128, 128, 1); } body[theme="dark"] footer p a, @@ -159,7 +156,7 @@ body[theme="dark"] footer p a:hover { } body[theme="dark"] .modal-content{ - background-color: #1c1d26; + background-color: rgba(28, 29, 38, 1); color: #f1f1f1; } @@ -170,3 +167,8 @@ body[theme="dark"] .modal-header{ body[theme="dark"] .modal-header i{ color: #f1f1f1; } + +body[theme="dark"] .toolbox i{ + color: rgba(241, 241, 241, 1); + background-color: rgba(0, 0, 0, 0.5); +} \ No newline at end of file diff --git a/resource/static/theme-server-status/css/main.css b/resource/static/theme-server-status/css/main.css index 6f3d6b1d6e..1fedb9dce3 100644 --- a/resource/static/theme-server-status/css/main.css +++ b/resource/static/theme-server-status/css/main.css @@ -50,6 +50,11 @@ body { /*margin-right: 5px;*/ } +.navbar .dropdown:hover, +.navbar .dropdown a{ + cursor: pointer; +} + .navbar .dropdown .dropdown-toggle { padding-bottom: 10px; padding-top: 10px; @@ -59,7 +64,7 @@ body { margin:0px -15px; } -.navbar .navbar-nav>li>a { +.navbar .navbar-nav > li > a { color:#f1f1f1; } @@ -137,6 +142,10 @@ body { text-align: left; } +tr.accordion-toggle{ + cursor:pointer; +} + .table > tbody > tr > td, .table > tbody > tr > th, .table > tfoot > tr > td, @@ -334,6 +343,15 @@ body { right: 13px; } +footer{ + padding-bottom: 2rem; +} + +footer p{ + text-align: center; + font-size: 10px; +} + @media only screen and (max-width: 1200px) { .accordian-body{ margin: 5px 0px 5px 10px; diff --git a/resource/template/theme-server-status/content-footer.html b/resource/template/theme-server-status/content-footer.html index fe16b72b11..57bad08224 100644 --- a/resource/template/theme-server-status/content-footer.html +++ b/resource/template/theme-server-status/content-footer.html @@ -1,8 +1,6 @@ {{define "theme-server-status/content-footer"}} -