Переглянути джерело

Removed collapse row button, added to row menu, made small change to text pannel to allow smaller height, Closes #727

Torkel Ödegaard 11 роки тому
батько
коміт
b989183fce

+ 1 - 1
src/app/panels/text/module.html

@@ -1,4 +1,4 @@
 <div ng-controller='text'>
-  <p ng-bind-html="content">
+  <p ng-bind-html="content" ng-show="content">
   </p>
 </div>

+ 4 - 5
src/app/partials/dashboard.html

@@ -24,16 +24,14 @@
 						<span class="row-text pointer" ng-click="toggle_row(row)" ng-bind="row.title"></span>
 					</div>
 					<div class="row-open" ng-show="!row.collapse">
-						<div class='row-tab bgPrimary' ng-click="toggle_row(row)">
-							<span class="row-tab-button">
-								<i class="icon-caret-right"></i>
-							</span>
-						</div>
 						<div class='row-tab bgSuccess dropdown' ng-show="row.editable">
 							<span class="row-tab-button dropdown-toggle" data-toggle="dropdown">
 								<i class="icon-th-list"></i>
 							</span>
 							<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="drop1">
+								<li>
+									<a ng-click="toggle_row(row)">Collapse row</a>
+								</li>
 								<li class="dropdown-submenu">
 									<a href="javascript:void(0);">Add Panel</a>
 									<ul class="dropdown-menu">
@@ -45,6 +43,7 @@
 								<li class="dropdown-submenu">
 									<a href="javascript:void(0);">Set height</a>
 									<ul class="dropdown-menu">
+										<li><a ng-click="set_height('25px')">25 px</a></li>
 										<li><a ng-click="set_height('100px')">100 px</a></li>
 										<li><a ng-click="set_height('150px')">150 px</a></li>
 										<li><a ng-click="set_height('200px')">200 px</a></li>

+ 3 - 3
src/css/less/overrides.less

@@ -268,9 +268,9 @@ form input.ng-invalid {
   left:-34px;
   position: absolute;
   z-index: 100;
-  transition: .25s left;
-  transition-delay: .25s;
-  -webkit-transition-delay: .25s;
+  transition: .10s left;
+  transition-delay: .10s;
+  -webkit-transition-delay: .10s;
 }
 
 .row-open:hover {