Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

The map is working #637

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ gem 'pg_search', '~> 2.3.5'
gem 'skylight', '~> 5.0'
gem 'sidekiq', '~> 6.1.2'
gem 'sidekiq-cron', '~> 1.2.0'
gem 'leaflet-rails', '~> 1.7.0'

# Assets
gem 'jquery-rails', '~> 4.3.5'
Expand Down
3 changes: 3 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,8 @@ GEM
kgio (2.11.3)
launchy (2.5.0)
addressable (~> 2.7)
leaflet-rails (1.7.0)
rails (>= 4.2.0)
letter_opener (1.7.0)
launchy (~> 2.2)
listen (3.2.1)
Expand Down Expand Up @@ -422,6 +424,7 @@ DEPENDENCIES
jquery-rails (~> 4.3.5)
json_translate (~> 4.0.0)
kaminari (~> 1.2.1)
leaflet-rails (~> 1.7.0)
letter_opener (~> 1.7.0)
listen (~> 3.2.0)
localeapp (~> 3.1)
Expand Down
2 changes: 2 additions & 0 deletions app/admin/organization.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
f.input :address
f.input :description
f.input :public_opening_times
f.input :latitude
f.input :longitude
end
f.actions
end
Expand Down
Binary file added app/assets/images/marker-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
//= require_tree ./application
//= require leaflet

$(document).on('click', 'a[data-popup]', function(event) {
event.preventDefault();
Expand Down
11 changes: 11 additions & 0 deletions app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
@import "application/bootstrap-custom";
@import "application/member-card";
@import "application/footer";
@import "application/leaflet";

html {
font-size: 62.5%;
Expand Down Expand Up @@ -668,3 +669,13 @@ label[required]::after{
display: inline;
margin: 0 !important;
}

#map {
height: 650px;
}

.last_line {
@media(max-width: $screen-sm-min) {
margin-bottom: 50px;
}
}
Loading