commit e65b633: [Minor] CSS clean up
moisseev
moiseev at mezonplus.ru
Wed Jul 22 19:14:06 UTC 2020
Author: moisseev
Date: 2020-07-22 18:51:17 +0300
URL: https://github.com/rspamd/rspamd/commit/e65b6337f8e9c57a93e641511dc79c6b5ca998ff (refs/pull/3449/head)
[Minor] CSS clean up
- remove unused declarations
- use Bootstrap classes
---
interface/css/rspamd.css | 56 ------------------------------------------------
interface/index.html | 38 ++++++++++++++++----------------
2 files changed, 19 insertions(+), 75 deletions(-)
diff --git a/interface/css/rspamd.css b/interface/css/rspamd.css
index 8f0262645..af410a3bb 100644
--- a/interface/css/rspamd.css
+++ b/interface/css/rspamd.css
@@ -104,10 +104,6 @@ textarea {
}
/* local overrides */
-.navbar-brand {
- margin-left: auto !important;
- padding: 0;
-}
.navbar-brand > img {
height: 50px;
}
@@ -115,20 +111,6 @@ textarea {
border-top-right-radius: .25rem !important;
border-bottom-right-radius: .25rem !important;
}
-.chart-content {
- text-align: center;
-}
-.chart {
- height: 400px;
- margin: 0 auto;
- text-align: center;
- background: #fff;
- display: flex;
- justify-content: center;
-}
-.chart svg {
- flex: none;
-}
.notice {
display: none;
}
@@ -257,12 +239,6 @@ table#symbolsTable input[type="number"] {
.stat-box .widget strong {
font-size: 26px;
}
-.nomargin {
- margin: 0 !important;
-}
-.nopadding {
- padding: 0 !important;
-}
/* Symbols coloring */
.symbol-default {
@@ -318,16 +294,6 @@ table#symbolsTable input[type="number"] {
margin-right: 9px;
}
-#throughput div.card-body {
- text-align: center;
-}
-#throughput div.card-body > div {
- display: inline-block;
-}
-#throughput div.card-body div.row {
- background: #fff;
-}
-
/* RRD summary */
#summary-row {
padding-left: 80px;
@@ -416,9 +382,6 @@ table#symbolsTable input[type="number"] {
}
#row-main {
- display: flex;
- flex-wrap: wrap;
- clear: both;
margin-left: -17.5px;
margin-right: -17.5px;
}
@@ -438,9 +401,6 @@ table#symbolsTable input[type="number"] {
transition: all 0.3s ease;
transition-property: flex-basis, max-width, width;
}
-#content label {
- font-weight: normal;
-}
.sidebar {
padding: 8px;
@@ -467,20 +427,14 @@ table#symbolsTable input[type="number"] {
.sidebar-nav {
width: 20px;
- border-bottom: none;
}
.sidebar-nav .nav-link,
.sidebar-nav .nav-link:hover {
border: 1px solid #ddd;
- border-bottom: none;
- padding-left: 1rem;
- padding-right: 1rem;
}
#sidebar-tab-left > a,
#sidebar-tab-right > a {
background-color: #ffe;
- padding-top: 0;
- padding-bottom: 0;
margin-left: 12px;
margin-right: 12px;
}
@@ -554,18 +508,8 @@ table#symbolsTable input[type="number"] {
border-radius: 0 0 calc(.25rem - 1px) 0;
}
-/* Dynamic width for modal */
-#modalDialog {
- text-align: center;
-}
#modalDialog > .modal-dialog {
- display: inline-block;
- max-width: 100%;
- text-align: left;
- width: auto !important;
-
/* Center the modal vertically */
- margin: 0 auto;
top: 50%;
transform: translate(0, -50%);
-webkit-transform: translate(0, -50%);
diff --git a/interface/index.html b/interface/index.html
index c8c05e5cc..b6dd4c502 100644
--- a/interface/index.html
+++ b/interface/index.html
@@ -29,7 +29,7 @@
<nav class="navbar navbar-light bg-light navbar-expand-md" id="navBar">
<form class="form-inline mr-auto">
- <div class="navbar-header navbar-brand">
+ <div class="navbar-header navbar-brand p-0">
<img src="./img/rspamd_logo_navbar.png" alt="Rspamd">
</div>
<select id="selSrv" class="form-control"></select>
@@ -91,7 +91,7 @@
<span class="icon mr-3"><i class="fas fa-server"></i></span>
<span class="h6 font-weight-bolder my-2">Servers</span>
</div>
- <div class="card-body nopadding table-responsive">
+ <div class="card-body p-0 table-responsive">
<table class="table table-sm table-hover table-bordered text-nowrap mb-0" id="clusterTable">
<thead class="text-secondary">
<tr>
@@ -114,9 +114,9 @@
<span class="icon mr-3"><i class="fas fa-chart-pie"></i></span>
<span class="h6 font-weight-bolder my-2">Statistics</span>
</div>
- <div class="card-body chart-content">
+ <div class="card-body">
<div class="row">
- <div class="chart" id="chart">
+ <div class="bg-white mx-auto" id="chart">
<span class="notice">Loading..</span>
<noscript>Please enable Javascript</noscript>
</div>
@@ -133,8 +133,8 @@
<span class="icon mr-3"><i class="fas fa-chart-area"></i></span>
<span class="h6 font-weight-bolder my-2">Throughput</span>
</div>
- <div class="card-body">
- <div>
+ <div class="card-body text-center">
+ <div class="d-inline-block bg-white">
<div class="row">
<div id="graph" class="mx-auto">
<span class="notice">Loading..</span>
@@ -221,7 +221,7 @@
<span class="icon mr-3"><i class="fas fa-list"></i></span>
<span class="h6 font-weight-bolder my-2">Lists</span>
</div>
- <div class="card-body nopadding">
+ <div class="card-body p-0">
<table class="table table-sm table-hover mb-0" id="listMaps">
</table>
</div>
@@ -239,7 +239,7 @@
</button>
</div>
</div>
- <div class="card-body nopadding">
+ <div class="card-body p-0">
<table class="table table-hover" id="symbolsTable"></table>
</div>
</div>
@@ -324,7 +324,7 @@
</button>
</div>
</div>
- <div class="card-body nopadding">
+ <div class="card-body p-0">
<div id="scanLog">
<table class="table mb-0" id="historyTable_scan"></table>
</div>
@@ -341,7 +341,7 @@
<div class="card-body py-0">
<div class="row h-100" id="row-main">
<div class="col-lg-3 sidebar h-100" id="sidebar-left">
- <div class="nopadding table-responsive mh-100 bg-white">
+ <div class="p-0 table-responsive mh-100 bg-white">
<table class="table table-sm small table-striped table-hover table-bordered mb-0" id="selectorsTable-extractors">
<thead><tr><th>Name</th><th>Description</th></tr></thead>
<tbody/>
@@ -352,9 +352,9 @@
<div class="col-lg-6 col-12 h-100" id="content">
<div class="row navbar-light h-100">
- <ul class="nav navbar-nav nav-tabs sidebar-nav">
+ <ul class="nav navbar-nav nav-tabs sidebar-nav border-bottom-0">
<li class="active text-nowrap nav-item" id="sidebar-tab-left">
- <a class="nav-link" href=""><div id="sidebar-tab-text-left">↕ List of extractors</div></a>
+ <a class="nav-link border-bottom-0 px-2 py-0" href=""><div id="sidebar-tab-text-left">↕ List of extractors</div></a>
</li>
</ul>
@@ -392,16 +392,16 @@
</div>
</div>
- <ul class="nav navbar-nav nav-tabs sidebar-nav">
+ <ul class="nav navbar-nav nav-tabs sidebar-nav border-bottom-0">
<li class="active text-nowrap nav-item" id="sidebar-tab-right">
- <a class="nav-link" href="">↕ List of transforms</a>
+ <a class="nav-link border-bottom-0 px-2 py-0" href="">↕ List of transforms</a>
</li>
</ul>
</div>
</div>
<div class="col-lg-3 sidebar h-100" id="sidebar-right">
- <div class="nopadding table-responsive mh-100 bg-white">
+ <div class="p-0 table-responsive mh-100 bg-white">
<table class="table table-sm small table-striped table-hover table-bordered mb-0" id="selectorsTable-transforms">
<thead><tr><th>Name</th><th>Description</th></tr></thead>
<tbody/>
@@ -436,7 +436,7 @@
</button>
</div>
</div>
- <div class="card-body nopadding">
+ <div class="card-body p-0">
<div id="historyLog">
<table class="table" id="historyTable_history"></table>
</div>
@@ -452,7 +452,7 @@
</button>
</div>
</div>
- <div class="card-body nopadding">
+ <div class="card-body p-0">
<table class="table table-hover mb-0" id="errorsLog"></table>
</div>
</div>
@@ -465,8 +465,8 @@
</div>
<!-- Common modal -->
-<div id="modalDialog" class="modal fade" data-backdrop="static" tabindex="-1" role="dialog">
- <div class="modal-dialog modal-xl">
+<div id="modalDialog" class="modal fade text-center" data-backdrop="static" tabindex="-1" role="dialog">
+ <div class="modal-dialog modal-xl d-inline-block mw-100 my-auto text-left">
<div class="modal-content shadow">
<div class="modal-header text-secondary py-2">
<i class="fas my-auto"></i><h6 class="modal-title font-weight-bolder mx-3" id="modalTitle"></h6>
More information about the Commits
mailing list