Fixes #10510: \"New category\" button hides \"Categories\" title on s…

…mall screens
Normation · Mar 27, 2017 · 20d6545 · 20d6545
1 parent 49ea5fe
commit 20d6545
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleDisplayer.scala b/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleDisplayer.scala
@@ -138,7 +138,7 @@ class RuleDisplayer (
   }
   def actionButtonCategory =
                if (directive.isEmpty) {
-                SHtml.ajaxButton("New Category", () => showCategoryPopup(None), ("class" -> "new-icon btn btn-success btn-sm"))
+                SHtml.ajaxButton("", () => showCategoryPopup(None), ("class" -> "new-icon category btn btn-success btn-sm"))
               } else {
                 NodeSeq.Empty
               }

diff --git a/rudder-web/src/main/webapp/style/rudder/rudder-rules.css b/rudder-web/src/main/webapp/style/rudder/rudder-rules.css
@@ -69,6 +69,26 @@ label.rule-info + div{
   width: calc(100% - 50px);
   left: 50px;
 }
+.new-icon.category:before{
+  content:"New category";
+}
+.tw-bs .btn.btn-box-tool{
+  padding-left:2px;
+  padding-right:2px;
+}
+.new-icon.category + .btn.btn-box-tool > .fa{
+  margin-left:0;
+}
+@media (min-width: 991px) and (max-width: 1300px){
+  .new-icon.category:before{
+    content:"New";
+    position:relative;
+    left:2px;
+  }
+  .new-icon.category:after{
+    content:"";
+  }
+}
 @media (max-width: 767px){
   .skin-yellow.sidebar-collapse .rule-footer,.skin-yellow .rule-footer {
     width: 100%;