Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

cleaning-portalmec
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

7910801f

Commit 7910801f authored 9 years ago by Mateus Rambo Strey

Downloads
- Plain Diff

Merge branch 'main-search' into 'master'

Main search

Fixed search filters and style

See merge request !171

parents d1832e8a c6b9efa7

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/application/search.js 19 additions, 19 deletions

app/assets/javascripts/application/search.js
app/assets/stylesheets/application.scss 9 additions, 7 deletions

app/assets/stylesheets/application.scss
app/controllers/search_controller.rb 16 additions, 16 deletions

app/controllers/search_controller.rb
app/models/learning_object.rb 4 additions, 1 deletion

app/models/learning_object.rb
app/views/search/_fetch.html.erb 25 additions, 0 deletions

app/views/search/_fetch.html.erb
app/views/search/index.html.erb 36 additions, 35 deletions

app/views/search/index.html.erb
app/views/shared/application/_header.html.erb 1 addition, 15 deletions

app/views/shared/application/_header.html.erb
app/views/shared/application/_home.html.erb 1 addition, 15 deletions

app/views/shared/application/_home.html.erb
app/views/shared/application/_search.erb 16 additions, 0 deletions

app/views/shared/application/_search.erb

with 127 additions and 108 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment