Few more small tweaks

src/app/panels/table/editor.html

@@ -1,49 +1,45 @@
   <div class="row-fluid">
-    <div class="section span6">
-      <h5>Columns</h5>
-      <form class="input-append editor-option">
-        <input bs-typeahead="fields.list" type="text" class="input-small" ng-model='newfield'>
-        <button class="btn" ng-click="toggle_field(newfield);newfield=''"><i class="icon-plus"></i></button>
-      </form><br>
-      <span style="margin-left:3px" ng-repeat="field in $parent.panel.fields" class="label">{{field}} <i class="pointer icon-remove-sign" ng-click="toggle_field(field)"></i></span>
-    </div>
-    <div class="section span6">
-      <h5>Hightlighted Fields</h5>
-      <form class="input-append editor-option">
-        <input bs-typeahead="fields.list" type="text" class="input-small" ng-model='newhighlight' ng-change="set_refresh(true)">
-        <button class="btn" ng-click="toggle_highlight(newhighlight);newhighlight=''"><i class="icon-plus"></i></button>
-      </form><br>
-      <span style="margin-left:3px" ng-repeat="field in $parent.panel.highlight" class="label">{{field}} <i class="pointer icon-remove-sign" ng-click="toggle_highlight(field);set_refresh(true)" ></i></span>
-    </div>
-  </div>
-
-  <div class="editor-row">
-    <div class="section">
+    <div class="span6 section">
       <h5>Options</h5>
       <div class="editor-option">
-        <h6>Header</h6><input type="checkbox" ng-model="panel.header" ng-checked="panel.header">
+        <label class="small">Header</label><input type="checkbox" ng-model="panel.header" ng-checked="panel.header">
       </div>
       <div class="editor-option">
-        <h6>Sorting</h6><input type="checkbox" ng-model="panel.sortable" ng-checked="panel.sortable">
+        <label class="small">Sorting</label><input type="checkbox" ng-model="panel.sortable" ng-checked="panel.sortable">
       </div>
       <div class="editor-option" style="white-space:nowrap" ng-show='panel.sortable'>
-        <h6>Sort</h6>
+        <label class="small">Sort</label>
         <input class="input-small" bs-typeahead="fields.list" ng-model="panel.sort[0]" type="text"></input>
         <i ng-click="set_sort(panel.sort[0])" ng-class="{'icon-chevron-up': panel.sort[1] == 'asc','icon-chevron-down': panel.sort[1] == 'desc'}"></i>
       </div>
-      <div class="editor-option"><h6>Font Size</h6>
+      <div class="editor-option"><label class="small">Font Size</label>
         <select class="input-small" ng-model="panel.style['font-size']" ng-options="f for f in ['7pt','8pt','9pt','10pt','12pt','14pt','16pt','18pt','20pt','24pt','28pt','32pt','36pt','42pt','48pt','52pt','60pt','72pt']"></select></span>
       </div>
       <div class="editor-option">
-        <h6>Trim Factor <tip>Trim fields to this long divided by # of rows. Requires data refresh.</tip></h6>
+        <label class="small">Trim Factor <tip>Trim fields to this long divided by # of rows. Requires data refresh.</tip></label>
         <input type="number" class="input-small" ng-model="panel.trimFactor" ng-change="set_refresh(true)">
       </div>
+      <br>
       <div class="editor-option">
-        <h6>Local Time <tip>Adjust time field to browser's local time</tip></h6><input type="checkbox" ng-change="set_refresh(true)" ng-model="panel.localTime" ng-checked="panel.localTime">
+        <label class="small">Local Time <tip>Adjust time field to browser's local time</tip></label><input type="checkbox" ng-change="set_refresh(true)" ng-model="panel.localTime" ng-checked="panel.localTime">
       </div>
       <div class="editor-option" ng-show="panel.localTime">
-        <h6>Time Field</h6>
+        <label class="small">Time Field</label>
         <input type="text" class="input-small" ng-model="panel.timeField" ng-change="set_refresh(true)" bs-typeahead="fields.list">
       </div>
     </div>
+    <div class="section span6">
+      <h5>Columns</h5>
+      <form class="input-append editor-option">
+        <input bs-typeahead="fields.list" type="text" class="input-small" ng-model='newfield'>
+        <button class="btn" ng-click="toggle_field(newfield);newfield=''"><i class="icon-plus"></i></button>
+      </form><br>
+      <span style="margin-left:3px" ng-repeat="field in $parent.panel.fields" class="label">{{field}} <i class="pointer icon-remove-sign" ng-click="toggle_field(field)"></i></span>
+      <h5>Hightlighted Fields</h5>
+      <form class="input-append editor-option">
+        <input bs-typeahead="fields.list" type="text" class="input-small" ng-model='newhighlight' ng-change="set_refresh(true)">
+        <button class="btn" ng-click="toggle_highlight(newhighlight);newhighlight=''"><i class="icon-plus"></i></button>
+      </form><br>
+      <span style="margin-left:3px" ng-repeat="field in $parent.panel.highlight" class="label">{{field}} <i class="pointer icon-remove-sign" ng-click="toggle_highlight(field);set_refresh(true)" ></i></span>
+    </div>
   </div>

src/app/partials/roweditor.html

@@ -22,7 +22,7 @@
   </div>
   <div class="row-fluid" ng-if="editor.index == 1">
     <div class="span12">
-      <h4>Panels <i class="icon-plus-sign link" bs-tooltip="'Add panel'" ng-click="editor.index = 2"></i></h4>
+      <h4>Panels</h4>
       <table class="table table-condensed table-striped">
         <thead>
           <th>Title</th>
@@ -60,6 +60,7 @@
   </div>
 </div>
 <div class="modal-footer">
-  <button ng-show="panel.type &amp;&amp; editor.index == 2" ng-click="add_panel(row,panel); reset_panel(); editor.index == 1;" class="btn btn-success" ng-disabled="panel.loadingEditor">Add Panel</button>
+  <button ng-show="editor.index == 1" ng-click="editor.index = 2;" class="btn btn-success" ng-disabled="panel.loadingEditor">Add Panel</button>
+  <button ng-show="panel.type && editor.index == 2" ng-click="add_panel(row,panel); reset_panel(); editor.index = 1;" class="btn btn-success" ng-disabled="panel.loadingEditor">Add Panel</button>
   <button type="button" class="btn btn-danger" ng-click="editor.index=0;dismiss();reset_panel();close_edit()">Close</button>
 </div>

src/vendor/bootstrap/less/variables.dark.less

@@ -54,7 +54,7 @@
 @altFontFamily:         @serifFontFamily;
 
 @headingsFontFamily:    inherit; // empty to use BS default, @baseFontFamily
-@headingsFontWeight:    normal;    // instead of browser default, bold
+@headingsFontWeight:    bold;    // instead of browser default, bold
 @headingsColor:         @white; // empty to use BS default, @textColor
 @inputText:             @black;
 

src/vendor/bootstrap/less/variables.light.less

@@ -57,7 +57,7 @@
 @altFontFamily:         @serifFontFamily;
 
 @headingsFontFamily:    inherit; // empty to use BS default, @baseFontFamily
-@headingsFontWeight:    300;    // instead of browser default, bold
+@headingsFontWeight:    bold;    // instead of browser default, bold
 @headingsColor:         @grayDarker; // empty to use BS default, @textColor