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

e4cd5aef

Commit e4cd5aef authored 9 years ago by Mauricio Giacomini Girardello

Downloads
- Plain Diff

Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec

parents a2e1b9b3 9dd45c89

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/application/search.js 20 additions, 0 deletions

app/assets/javascripts/application/search.js
app/assets/stylesheets/application.scss 12 additions, 0 deletions

app/assets/stylesheets/application.scss
app/assets/stylesheets/application/search.scss 7 additions, 0 deletions

app/assets/stylesheets/application/search.scss
app/assets/stylesheets/application/users.scss 21 additions, 2 deletions

app/assets/stylesheets/application/users.scss
app/views/layouts/application.html.erb 1 addition, 1 deletion

app/views/layouts/application.html.erb
app/views/learning_objects/_learning_object_horizontal.erb 1 addition, 1 deletion

app/views/learning_objects/_learning_object_horizontal.erb
app/views/search/index.html.erb 3 additions, 26 deletions

app/views/search/index.html.erb
app/views/users/show.html.erb 6 additions, 16 deletions

app/views/users/show.html.erb

with 71 additions and 46 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