diff options
| author | Luc Donnet | 2014-09-30 14:29:57 +0200 |
|---|---|---|
| committer | Luc Donnet | 2014-09-30 14:29:57 +0200 |
| commit | 2ee68cc2cae82a21ac5468ffe55945acbdd60ba0 (patch) | |
| tree | c90c8dd21aa67164e247cef12d89e1532f750ed4 | |
| parent | e72c774178b2bab0fd5bc85ef969b4eeec9ce8fb (diff) | |
| download | chouette-core-2ee68cc2cae82a21ac5468ffe55945acbdd60ba0.tar.bz2 | |
Fix select parent selection and color for token input style Refs #0029069
| -rw-r--r-- | app/assets/stylesheets/vendor/token-input.css | 9 | ||||
| -rw-r--r-- | app/views/stop_areas/select_parent.html.erb | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app/assets/stylesheets/vendor/token-input.css b/app/assets/stylesheets/vendor/token-input.css index 50676f980..89dbd802e 100644 --- a/app/assets/stylesheets/vendor/token-input.css +++ b/app/assets/stylesheets/vendor/token-input.css @@ -49,7 +49,7 @@ li.token-input-token { height: 1%; margin: 3px; padding: 3px 5px; - background-color: #d0efa0; + background-color: $gray-lighter; color: #000; font-weight: bold; cursor: default; @@ -123,5 +123,10 @@ div.token-input-dropdown ul li em { } div.token-input-dropdown ul li.token-input-selected-dropdown-item { - background-color: #d0efa0; + background-color: $gray-lighter; +} + +ul.token-input-list .info{ + font-size: 0.8em; + color: $gray; }
\ No newline at end of file diff --git a/app/views/stop_areas/select_parent.html.erb b/app/views/stop_areas/select_parent.html.erb index 9909e49d0..fd1b292c6 100644 --- a/app/views/stop_areas/select_parent.html.erb +++ b/app/views/stop_areas/select_parent.html.erb @@ -3,7 +3,7 @@ <%= semantic_form_for [@referential, @stop_area] do |form| %> <div> <%= form.inputs do %> - <%= form.input :parent_id, :as => :search_stop_area, :json => referential_stop_area_stop_area_parents_path(@referential, @stop_area, :format => :json), :hint_text => t('search_hint'), :no_result_text => t('no_result_text'), :searching_text => t('searching_term'), :input_html => { :"data-pre" => Rabl::Renderer.new('stop_areas/show', [@parent], :view_path => 'app/views', :format => :json).render } %> + <%= form.input :parent_id, :as => :search_stop_area, :json => referential_stop_area_stop_area_parents_path(@referential, @stop_area, :format => :json), :hint_text => t('search_hint'), :no_result_text => t('no_result_text'), :searching_text => t('searching_term'), :tokenLimit => 1, :input_html => { :"data-pre" => Rabl::Renderer.new('stop_areas/show', [@parent].compact, :view_path => 'app/views', :format => :json).render } %> <% end %> <%= form.actions do %> |