Merge pull request #635 from VinceMacBuche/ust_5537/bug_5637/CHrome_b…

…order_menu Fixes #5637: Repair css on the glyphicon use for status
Normation · Oct 10, 2014 · 33ad4ca · 33ad4ca
2 parents ead33ad + e5119b5
commit 33ad4ca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/comet/AsyncDeployment.scala b/rudder-web/src/main/scala/com/normation/rudder/web/comet/AsyncDeployment.scala
@@ -172,7 +172,7 @@ class AsyncDeployment extends CometActor with CometListener with Loggable {
 
         <li class="dropdown">
           <a href="#" class="dropdown-toggle"  data-toggle="dropdown">
-            <span>Status</span> <span class="badge"> {statusIcon}</span><span class="caret" style="margin-left:5px"></span></a>
+            <span>Status</span> <span class="badge" id="generation-status"> {statusIcon}</span><span class="caret" style="margin-left:5px"></span></a>
           <ul class="dropdown-menu" role="menu">
             {lastStatus}
             <li>{currentStatus}</li>

diff --git a/rudder-web/src/main/webapp/style/rudder-bootstrap.css b/rudder-web/src/main/webapp/style/rudder-bootstrap.css
@@ -96,7 +96,6 @@
 .tw-bs a .badge .glyphicon{
   color: #eee;
   font-size:12px;
-  top:0;
 }
 
 .tw-bs a .badge .glyphicon.glyphicon-ok{
@@ -216,3 +215,8 @@
   }
 }
 
+#generation-status{
+	padding-top:2px;
+	padding-bottom:4px;
+}
+