Merge branch 'master' into 'develop'

Master

See merge request !328

javascript/src/Main.js

@@ -71,15 +71,19 @@ $(document).ready( function () {
                 return;
             }
             var closeButton = $("<span>", {
-                class: "qfq-clear-me-button hidden"
+                class: "qfq-clear-me-button",
+                html: "&times;"
             });
+            if (myInput.val() == '' || myInput.is('[disabled=disabled]')) {
+               closeButton.addClass("hidden");
+            }
             closeButton.on("click", function(e) {
                 myInput.val('');
                 closeButton.addClass("hidden");
             });
             $(this).after(closeButton);
             $(this).on("input", function() {
-                if(myInput.val() != '') {
+                if(myInput.val() != '' && !myInput.is('[disabled=disabled]')) {
                     closeButton.removeClass("hidden");
                 } else {
                     closeButton.addClass("hidden");
@@ -90,4 +94,4 @@ $(document).ready( function () {
         n.Helper.calendar();
 
     })(QfqNS);
-});
\ No newline at end of file
+});

less/qfq-bs.css.less

@@ -1115,27 +1115,16 @@ span.qfq-more-text {
 
 .qfq-clear-me-button {
   display: block;
-  content: '\f00d';
-  font-family: FontAwesome;
-  right:21px;
-  width: 30px;
-  height: 30px;
+  right:12px;
   top: 2px;
+  font-size: 18px;
+  line-height: 18px;
+  color: #888;
+  padding: 6px 14px;
   position:absolute;
   cursor: pointer;
 }
-.qfq-clear-me-button:before {
-  content: '\f00d';
-  font-family: FontAwesome;
-  position: absolute;
-  color: #aaa;
-  font-size: 21px;
-  left: 12px;
-}
 
-input.qfq-clear-me {
-  padding-right: 28px;
-}
 
 // Droplets
 
@@ -1335,4 +1324,4 @@ thead.qfq-sticky td {
 
 .qfq-badge-inverse:hover {
   background-color: #1a1a1a;
-}
\ No newline at end of file
+}