Skip to content

Commit

Permalink
Finishes taking of the map from the app
Browse files Browse the repository at this point in the history
  • Loading branch information
gustavoguichard committed Dec 17, 2012
1 parent 0c21574 commit 6c178d7
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 15 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ notifications:
recipients:
- [email protected]
- [email protected]
- [email protected]

Binary file added app/assets/images/badges/blank.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/pins/blank.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 8 additions & 1 deletion app/assets/stylesheets/homepage.css.sass
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,11 @@ body[data-action="Index"][data-controller-name="Ideas"]
background:
image: url(image_path("arrows.png"))
repeat: no-repeat
position: 0 -262px
position: 0 -262px

a.more.right
margin: 5px

.recent_ideas
a.more
margin-top: -20px
5 changes: 1 addition & 4 deletions app/assets/stylesheets/timeline.css.sass
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
article.timeline
a.more
margin: 5px

section.timeline
ul
margin: 0
margin-bottom: 20px
Expand Down
19 changes: 11 additions & 8 deletions app/views/ideas/index.html.slim
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
h1.title Ideias recentes
h2.info
| Quer ver mais ideias?
= link_to t("idea.filters.title"), scope_root_path, class: "button start"
section.recent_ideas
h1.title Ideias recentes
h2.info
| Quer ver mais ideias?
= link_to t("idea.filters.title"), scope_root_path

ol.ideas_buckets
- @ideas.each do |idea|
li.bucket class=cycle('odd', 'middle', 'even')
= render idea
ol.ideas_buckets
- @ideas.each do |idea|
li.bucket class=cycle('odd', 'middle', 'even')
= render idea

= link_to "+ " + t("idea.filters.title"), scope_root_path, class: "right more"

= render "timeline/audits"
2 changes: 1 addition & 1 deletion app/views/layouts/application.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ html
nav.top_menu
ul.actions
- path = request.path
li class=(path.include?(map_ideas_path) ? 'selected' : '')
/li class=(path.include?(map_ideas_path) ? 'selected' : '')
= link_to map_ideas_path do
| Mapa de ideias
li class=(path.include?(timeline_index_path) ? 'selected' : '')
Expand Down
2 changes: 1 addition & 1 deletion app/views/timeline/_audits.html.slim
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
article.timeline
section.timeline
h1.title Atividade recente
h2.info O que está acontecendo no FdI agora

Expand Down

0 comments on commit 6c178d7

Please sign in to comment.