#91: largeurs du tableau des filtres d'interaction

makinacorpus · Jul 23, 2015 · bfd5ae3 · bfd5ae3
1 parent bed61be
commit bfd5ae3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/app/scripts/app.js b/app/scripts/app.js
@@ -21,7 +21,8 @@ angular
     'ui.bootstrap-slider',
     'ui.keypress',
     'ui.grid',
-    'ui.grid.edit'
+    'ui.grid.edit',
+    'ui.grid.autoResize'
   ])
   .config(function($routeProvider) {
     $routeProvider

diff --git a/app/styles/map.scss b/app/styles/map.scss
@@ -44,9 +44,8 @@
   background-color: #EEEEEE;
 }
 
-.myGrid {
-  width: 800px;
-  height: 250px;
+.filters-grid {
+  height: 500px;
 }
 
 .highlight {

diff --git a/app/views/commonmap.html b/app/views/commonmap.html
@@ -86,11 +86,11 @@
   Ajouter des interactions <span class="glyphicon glyphicon-menu-left" aria-hidden="true"></span>
 </button>
 
-<div class="col-xs-6 menu-right" ng-show="rightMenuVisible">
+<div id="filters-container" class="col-xs-6 menu-right" ng-show="rightMenuVisible">
   <button class="btn btn-default pull-right" ng-click="hideMenu()" type="button">
     <span class="glyphicon glyphicon-menu-right" aria-hidden="true"></span>
   </button>
   <button id="button_add" class="btn btn-success" ng-click="addFilter()">Ajouter un filtre d'interaction</button>
-  <div ui-grid="interactiveFilters" ui-grid-edit ui-grid-selection class="myGrid"></div>
+  <div ui-grid="interactiveFilters" ui-grid-edit ui-grid-selection ui-grid-auto-resize class="filters-grid"></div>
 </div>