Dev: fixed single lining

LimeSurvey · Nov 28, 2016 · 4c8ebe6 · 4c8ebe6
1 parent 32916db
commit 4c8ebe6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/application/views/admin/super/_question_explorer.php b/application/views/admin/super/_question_explorer.php
@@ -31,8 +31,7 @@
     <!-- The actual panle-element which contains the tree, and the filter_input -->
     <div class="panel-body">
         <!-- The filtering input, fixed against submit, by js -->
-        <div class="row row-with-margin">
-            <br/>   
+        <div class="row row-with-margin"> 
             <input class="col-xs-12 form-control" id="searchInQuestionTree" name="searchInQuestionTree" placeholder="<?php eT("Search for question/questiongroup"); ?>" />
         </div>
         <!-- the fancytree container, here is where the magic happens -->

diff --git a/scripts/admin/jquery.fancytree.bsbuttonbar.js b/scripts/admin/jquery.fancytree.bsbuttonbar.js
@@ -48,7 +48,8 @@
              renderButtons = function(node){
                 var baseButton = $('<a role="button"></a>)'),
                     buttonContainer = $('<div class="btn-group pull-right fancytree-innerhtml-buttonbar" role="group"></div>'),
-                    container = $('<div class="row text-right" style="margin:0;padding:0;height:15px;"></div>');
+                    container = $('<div class="col-xs-12"></div>'),
+                    row = $('<div class="row text-right" style="margin:0;padding:0;height:15px;"></div>');
 
                 //console.log(node.data.buttons);
                 $.each( node.data.buttonlinks, function( key, button ){
@@ -111,7 +112,8 @@
                 try{infoButton.call(button.toggle);}catch(e){}
 
                 container.append(buttonContainer);
-                $(node.span).find('.fancytree-innerhtml-container').prepend(container);
+                row.append(container);
+                $(node.span).find('.fancytree-innerhtml-container').prepend(row);
 
              };
              this._superApply(arguments);

diff --git a/third_party/fancytree/dist/skin-bootstrap-ls/ui.fancytree.css b/third_party/fancytree/dist/skin-bootstrap-ls/ui.fancytree.css
@@ -188,14 +188,14 @@ span.fancytree-node {
   display: inherit;
   width: 100%;
   margin-top: 0px;
-  min-height: 2em;
+  min-height: 1em;
 }
 span.fancytree-title {
   color: #333333;
   cursor: pointer;
   display: inline-block;
   vertical-align: top;
-  min-height: 2em;
+  min-height: 1em;
   padding: 0 3px 0 3px;
   margin: 1px 0 0 0em;
   border: 1px solid transparent;

diff --git a/third_party/fancytree/dist/skin-bootstrap-ls/ui.fancytree.less b/third_party/fancytree/dist/skin-bootstrap-ls/ui.fancytree.less
@@ -70,7 +70,7 @@
 @fancy-use-sprites: false;     // false: suppress all background images (i.e. icons)
 @fancy-loading-url: none;
 
-@fancy-line-height: 2em;       // height of a nodes selection bar including borders
+@fancy-line-height: 1em;       // height of a nodes selection bar including borders
 @fancy-node-v-spacing: 0px;    // gap between two node borders
 @fancy-icon-width: 1.6em;
 @fancy-icon-height: 1em;