Work in progress

RaphaelGauthier · Nov 18, 2020 · 9274785 · 9274785
1 parent 02b94b6
commit 9274785
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 18 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-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;