diff options
| author | Michel Etienne | 2014-08-19 16:36:23 +0200 |
|---|---|---|
| committer | Michel Etienne | 2014-08-19 16:36:23 +0200 |
| commit | fff7c33c1bac47b0382a59c3569ddfe4bb4f133a (patch) | |
| tree | 5c02beef0bd2602a362458e7c2db6074da3874e4 | |
| parent | fcd08af1f843900e5664f92fe814138f7d6e50e9 (diff) | |
| parent | 8a06d5a3d182a2a00987f86a8a4cc03f836102cc (diff) | |
| download | chouette-core-fff7c33c1bac47b0382a59c3569ddfe4bb4f133a.tar.bz2 | |
Merge branch 'sismo' of github.com:afimb/chouette2 into sismo
| -rw-r--r-- | app/assets/stylesheets/main/time_table_combinations.css.scss | 11 | ||||
| -rw-r--r-- | app/views/shared/_breadcrumb.erb | 3 | ||||
| -rw-r--r-- | app/views/time_table_combinations/_combine_form.html.erb | 4 |
3 files changed, 16 insertions, 2 deletions
diff --git a/app/assets/stylesheets/main/time_table_combinations.css.scss b/app/assets/stylesheets/main/time_table_combinations.css.scss new file mode 100644 index 000000000..4cc0cfdc2 --- /dev/null +++ b/app/assets/stylesheets/main/time_table_combinations.css.scss @@ -0,0 +1,11 @@ +#combine_form{ + + .time_table_combination{ + + .inputs{ + + overflow: visible !important; + } + + } +}
\ No newline at end of file diff --git a/app/views/shared/_breadcrumb.erb b/app/views/shared/_breadcrumb.erb new file mode 100644 index 000000000..728d445ae --- /dev/null +++ b/app/views/shared/_breadcrumb.erb @@ -0,0 +1,3 @@ +<% if @breadcrumbs.present? %> + <%= render_breadcrumbs builder: BootstrapBreadcrumbsBuilder, :tag => :li, :separator => "" %> +<% end %> diff --git a/app/views/time_table_combinations/_combine_form.html.erb b/app/views/time_table_combinations/_combine_form.html.erb index f0dca6386..e899ee1f8 100644 --- a/app/views/time_table_combinations/_combine_form.html.erb +++ b/app/views/time_table_combinations/_combine_form.html.erb @@ -3,13 +3,13 @@ <%= render "shared/flash_messages" %> <%= form.inputs do %> <%= form.input :operation, :as => :radio, :collection => Hash[TimeTableCombination.operations.map {|b| [t( b, :scope => "time_table_combinations.operations"),b]}] %> - <%= form.input :combined_name, :class => "typeahead form-control input-lg" %> + <%= form.input :combined_name, :class => "typeahead", :input_html => { :class => "form-control" } %> <%= form.input :combined_id, :as => :hidden %> <% end %> </div> <div class="modal-footer"> <%= form.actions do %> - <%= form.action :submit, :as => :button , :label => t('time_tables.show.combine')%> + <%= form.action :submit, :as => :button , :label => t('time_tables.show.combine') %> <% end %> </div> |