Merge branch 'fix-interface#2' into 'master'
Fix interface#2 See merge request !208
Showing
- app/assets/stylesheets/application.scss 11 additions, 153 deletionsapp/assets/stylesheets/application.scss
- app/assets/stylesheets/application/learning_objects.scss 10 additions, 0 deletionsapp/assets/stylesheets/application/learning_objects.scss
- app/controllers/collections_controller.rb 3 additions, 3 deletionsapp/controllers/collections_controller.rb
- app/controllers/complaints_controller.rb 2 additions, 2 deletionsapp/controllers/complaints_controller.rb
- app/controllers/feedbacks_controller.rb 1 addition, 1 deletionapp/controllers/feedbacks_controller.rb
- app/controllers/institutions_controller.rb 3 additions, 3 deletionsapp/controllers/institutions_controller.rb
- app/controllers/learning_objects_controller.rb 3 additions, 3 deletionsapp/controllers/learning_objects_controller.rb
- app/views/learning_objects/show.html.erb 5 additions, 0 deletionsapp/views/learning_objects/show.html.erb
- app/views/management/carousels/_form.html.erb 1 addition, 1 deletionapp/views/management/carousels/_form.html.erb
- app/views/management/complaint_reasons/_form.html.erb 1 addition, 1 deletionapp/views/management/complaint_reasons/_form.html.erb
- app/views/management/mime_types/_form.html.erb 1 addition, 1 deletionapp/views/management/mime_types/_form.html.erb
- app/views/management/object_types/_form.html.erb 2 additions, 2 deletionsapp/views/management/object_types/_form.html.erb
- app/views/management/users/_form.html.erb 1 addition, 1 deletionapp/views/management/users/_form.html.erb
- app/views/shared/application/_footer.html.erb 15 additions, 10 deletionsapp/views/shared/application/_footer.html.erb
- app/views/shared/application/_footer_home.html.erb 14 additions, 10 deletionsapp/views/shared/application/_footer_home.html.erb
- app/views/shared/application/_header.html.erb 1 addition, 3 deletionsapp/views/shared/application/_header.html.erb
- config/locales/pt-BR.yml 38 additions, 1 deletionconfig/locales/pt-BR.yml
Loading
Please register or sign in to comment