Work in progress

RaphaelGauthier · Nov 24, 2020 · 6155d27 · 6155d27
1 parent 7e92207
commit 6155d27
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 23 deletions.
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/index.html b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/index.html
@@ -14,29 +14,41 @@
         <div class="panel-heading">Statistics</div>
         <div data-lift="lazy-load?template=lazy-load-spinner">
           <ul class="nav nav-pills nav-stacked navbar-rudder" style="border-radius:4px">
-            <li ><a href="/secure/nodeManager/nodes">
-              <span class="badge pull-right"> <div data-lift="HomePage.acceptedNodes" > </div></span>
-              Nodes</a>
+            <li>
+              <a href="/secure/nodeManager/nodes">
+                Nodes
+                <span class="badge"><div data-lift="HomePage.acceptedNodes"></div></span>
+              </a>
             </li>
-            <li ><a href="/secure/nodeManager/manageNewNode">
-              <span class="badge pull-right" > <div data-lift="HomePage.pendingNodes" ></div></span>
-              Pending nodes</a>
+            <li>
+              <a href="/secure/nodeManager/manageNewNode">
+                Pending nodes
+                <span class="badge"><div data-lift="HomePage.pendingNodes"></div></span>
+              </a>
             </li>
-            <li><a href="/secure/configurationManager/ruleManagement">
-              Rules <span class="badge pull-right" > <div data-lift="HomePage.rules" ></div></span>
+            <li>
+              <a href="/secure/configurationManager/ruleManagement">
+                Rules
+                <span class="badge"><div data-lift="HomePage.rules"></div></span>
               </a>
             </li>
-            <li ><a href="/secure/configurationManager/directiveManagement">
-              <span class="badge pull-right" > <div data-lift="HomePage.directives" ></div></span>
-              Directives</a>
+            <li>
+              <a href="/secure/configurationManager/directiveManagement">
+                Directives
+                <span class="badge"><div data-lift="HomePage.directives"></div></span>
+              </a>
             </li>
-            <li ><a href="/secure/nodeManager/groups">
-              <span class="badge pull-right" > <div data-lift="HomePage.groups"></div></span>
-              Groups</a>
+            <li>
+              <a href="/secure/nodeManager/groups">
+                Groups
+                <span class="badge"><div data-lift="HomePage.groups"></div></span>
+              </a>
             </li>
-            <li ><a href="/secure/administration/techniqueLibraryManagement">
-              <span class="badge pull-right" > <div data-lift="HomePage.techniques" ></div></span>
-              Techniques</a>
+            <li>
+              <a href="/secure/administration/techniqueLibraryManagement">
+                Techniques
+                <span class="badge"><div data-lift="HomePage.techniques"></div></span>
+              </a>
             </li>
           </ul>
         </div>

diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/style/login.css b/webapp/sources/rudder/rudder-web/src/main/webapp/style/login.css
@@ -110,7 +110,7 @@ html,body{
   font-size: 20px;
   border-top-right-radius:5px;
   border-bottom-right-radius:5px;
-  height: 36px;
+  height: initial;
 }
 #login-page #formbox .form-control:focus{
 	color: #222D32;

diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/style/rudder/rudder-datatable.css b/webapp/sources/rudder/rudder-web/src/main/webapp/style/rudder/rudder-datatable.css
@@ -268,6 +268,9 @@ td.listclose:after {
   text-align: right;
   padding-top: 3px;
 }
+.dataTables_paginate .fg-button {
+  display: inline-block;
+}
 .dataTables_paginate > .ui-button,
 .dataTables_paginate > span > .ui-button,
 .dataTables_paginate > span > .ellipsis{
@@ -299,6 +302,8 @@ td.listclose:after {
 .dataTables_paginate > span > .ellipsis{
   margin-right: -1px;
   cursor: default !important;
+  display: inline-block;
+  overflow: initial;
 }
 .dataTables_length select {
   padding: 2px;

diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/style/rudder/rudder-groups.css b/webapp/sources/rudder/rudder-web/src/main/webapp/style/rudder/rudder-groups.css
@@ -99,10 +99,6 @@ content-query{
 #query_lines tbody tr td:nth-child(5),#query_lines tbody tr td.last{
   width:25px;
 }
-.searchNodes .query_line .form-control.input-sm {
-  height: 24px;
-  padding: 0px 2px;
-}
 .rudder-form.form-sm{
   margin-bottom: 12px;
 }
@@ -120,6 +116,12 @@ content-query{
 #tabPropsId{
   margin-bottom: 20px;
 }
+
+.main-details .main-form > .form-group.wbBaseField:first-child,
+.main-details .main-form > .form-group.wbBaseField:first-child label,
+.main-details .main-form > .info:first-child h4{
+  margin-top : 0px;
+}
 /* === TOGGLE BUTTONS === */
 label.radio-inline {
   padding: 0;

diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/style/rudder/rudder-menu.css b/webapp/sources/rudder/rudder-web/src/main/webapp/style/rudder/rudder-menu.css
@@ -160,6 +160,11 @@ pre.json-beautify.toggle:after, .content-wrapper pre.json-beautify.toggle:after{
 .skin-yellow .modal .modal-footer .btn {
   width:auto;
 }
+
+#sendMetricsPopup .btn {
+  line-height: initial;
+  padding: 8px 12px;
+}
 /* - LABEL BOOTSTRAP */
 .content-wrapper label.radio{
   color: #555;
@@ -577,9 +582,16 @@ a.sidebar-toggle{
   border-color: #F0F0F0;
   margin: 0 10px 10px 10px;
 }
+.stats li > a{
+  display: flex;
+  justify-content: space-between;
+}
 .stats li>a .badge{
   background-color: #222D32;
   opacity:.5;
+  display: inline-flex;
+  justify-content: center;
+  align-items: flex-end;
 }
 .stats li>a:hover .badge{
   background-color: #222D32;
@@ -613,6 +625,8 @@ ul.graph-legend > li.legend{
   transition-duration:.2s;
   cursor:pointer;
   border-radius:4px;
+  display: flex;
+  align-items: flex-end;
 }
 ul.graph-legend > li.legend:hover{
   background-color:#f4f4f4;
@@ -1099,6 +1113,13 @@ ul.graph-legend > li.legend:hover{
   padding: 0 15px;
 }
 
+/* --- SEARCH NODES --- */
+.searchNodes .query_line .form-control.input-sm {
+  height: auto;
+  padding: 6px 2px 4px 2px;
+  vertical-align: middle;
+  display: inline-block;
+}
 /* --- ACCEPT NEW NODES --- */
 .tabInform .glyphicon{
   margin: 0 6px 0 4px;

diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/style/rudder/rudder-template.css b/webapp/sources/rudder/rudder-web/src/main/webapp/style/rudder/rudder-template.css
@@ -50,7 +50,8 @@
   padding: 0 0 0 10px;
 }
 .content-wrapper .rudder-template .jstree .jstree-anchor {
-  display: inline-block;
+  display: inline-flex;
+  align-items: baseline;
   padding-right: 10px;
   word-break: break-word;
   width: calc(100% - 15px);
@@ -65,6 +66,10 @@
 .content-wrapper .rudder-template .jstree  .jstree-node{
   overflow: hidden;
 }
+.content-wrapper .rudder-template .jstree .fa.jstree-icon,
+.content-wrapper .rudder-template .jstree .rudder-label.label-sm{
+  margin-right: 2px;
+}
 .main-details .well{
   padding: 6px 12px;
 }