Skip to content

feat(map): hide map on mobile and added button to show it #538

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.

Sign up for GitHub

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

Merged
cbaudouinjr merged 7 commits into from
Jan 24, 2021
Merged

feat(map): hide map on mobile and added button to show it #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0087017
hide map on mobile and added button to show it
JeremyRudman Jan 23, 2021
96a86f4
map button text now changes when map is open
JeremyRudman Jan 23, 2021
b5f9dc1
Merge branch '2.2' into hm-327
JeremyRudman Jan 23, 2021
516a34f
Merge branch '2.2' into hm-327
cbaudouinjr Jan 24, 2021
736f699
fix houndci errors
JeremyRudman Jan 24, 2021
34fc91f
Merge branch 'hm-327' of https://github.com/codeRIT/hackathon-manager…
JeremyRudman Jan 24, 2021
e493ab9
Merge branch '2.2' into hm-327
cbaudouinjr Jan 24, 2021
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
13 changes: 13 additions & 0 deletions app/assets/javascripts/manage/lib/dashboardMap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
document.addEventListener('turbolinks:load', function () {
$('.map-button').click(function (){
var map = $('#map');
if(map.is(':visible')){
map.hide();
$(this).html('Show Map');
}
else{
map.show();
$(this).html('Hide Map');
}
});
});
18 changes: 16 additions & 2 deletions app/assets/stylesheets/manage.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,13 @@ $grey-med: #999
text-align: center
overflow: auto
width: 100%
@media (max-width: 768px)
display: none

.map-button
display: none
@media (max-width: 768px)
display: block

.narrow-icon
width: 40px
Expand All @@ -74,21 +81,25 @@ $grey-med: #999
vertical-align: top
position: absolute
z-index: 1
background: rgba(#ffffff,0.86)
background: rgba(#ffffff, 0.86)
margin-left: 33px
padding: 0 6%
height: 136px

h3
color: $black
font-weight: 500
margin: 1.2em 0 0

p
font-size: 14px
margin: 0.5em 0 1.2em

&.double-metrics
h3
margin-top: 0.45em
font-size: 21px

p
font-size: 13px
margin-top: 0.3em
Expand All @@ -97,6 +108,7 @@ $grey-med: #999
list-style: none
margin: 0 0 10px
padding: 0

li
margin: 0
padding: 2px
Expand All @@ -116,7 +128,8 @@ $grey-med: #999
height: calc(100% + 20px)

.editor-toolbar.fullscreen
z-index: 1031 // in front of the navbar
z-index: 1031
// in front of the navbar

/*
* Mobile nav
Expand All @@ -131,6 +144,7 @@ $grey-med: #999

.navbar-mobile-toggle--active
background: #eeeeee

.fa
color: black !important

Expand Down
2 changes: 2 additions & 0 deletions app/views/manage/dashboard/index.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

= render "layouts/manage/page_title", title: t(:title, scope: 'pages.manage.dashboard')

%button.btn.btn-secondary.w-100.map-button Show Map

.row
.col
#map
Expand Down