From 8ffc929f789b7f1b2594ac8126f307a9afe6c470 Mon Sep 17 00:00:00 2001 From: Ting Lew Date: Wed, 19 Aug 2015 19:50:20 -0400 Subject: [PATCH 1/2] removed alerts --- app/assets/javascripts/housing_locations.js.coffee | 4 ++-- app/views/housing_forms/update_location.js.erb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/housing_locations.js.coffee b/app/assets/javascripts/housing_locations.js.coffee index b169d0e7..7d604808 100644 --- a/app/assets/javascripts/housing_locations.js.coffee +++ b/app/assets/javascripts/housing_locations.js.coffee @@ -124,7 +124,7 @@ $ -> # Case where longitude and latitude exist. # Remove code when all pdfs have valid lats/longs on initialize if (housing_data.lat != null && housing_data.long != null) - alert('using database') + console.log('retrieving coordinates using database') coordinates = [housing_data.lat, housing_data.long] addMarker coordinates,name,map $('#housing-location-modal').modal() @@ -132,6 +132,6 @@ $ -> # call geocode on empty lat/long # currently does not update locations, unless desired. else - alert('call geocode') + console.log('geocoding called, will NOT save') displayHousingLocationMap address,name,map ) diff --git a/app/views/housing_forms/update_location.js.erb b/app/views/housing_forms/update_location.js.erb index 5315b31c..940bfcf9 100644 --- a/app/views/housing_forms/update_location.js.erb +++ b/app/views/housing_forms/update_location.js.erb @@ -7,7 +7,7 @@ var coordinates=[]; var controlLoop = 0; if ("<%= @housing_form.location %>" != "") { - alert('geocoding'); + console.log('geocoding'); geocode("<%= @housing_form.location %>"); } else { From c99c71de01a3f6dd27e9ea1fd6e1962248af459c Mon Sep 17 00:00:00 2001 From: Ting Lew Date: Mon, 8 May 2017 16:40:31 -0400 Subject: [PATCH 2/2] removing sidebar --- app/assets/stylesheets/navbars.css.scss | 58 +------------------------ app/views/layouts/_navbar.html.erb | 6 ++- app/views/layouts/_sidebar.html.erb | 16 ------- app/views/layouts/application.html.erb | 5 +-- 4 files changed, 8 insertions(+), 77 deletions(-) delete mode 100644 app/views/layouts/_sidebar.html.erb diff --git a/app/assets/stylesheets/navbars.css.scss b/app/assets/stylesheets/navbars.css.scss index c03f6826..cb7b34bf 100644 --- a/app/assets/stylesheets/navbars.css.scss +++ b/app/assets/stylesheets/navbars.css.scss @@ -1,49 +1,10 @@ -#sidebar-wrapper { - margin-left: -220px; - left: 220px; - width: 220px; - background: rgba(0, 0, 0, 0.8); - position: fixed; - height: 100%; - overflow-y: auto; - z-index: 1000; - transition: all 0.4s ease 0s; -} - -.sidebar-nav { - padding-left:0px; - > a > li { - padding: 15px 0px; - padding-left: 20px; - color: grey; - - -webkit-transition: color .5s ease-in-out; - -moz-transition: color .5s ease-in-out; - -o-transition: color .5s ease-in-out; - -transition: color .5s ease-in-out; - -webkit-transition: background .25s ease-in-out; - -moz-transition: background .25s ease-in-out; - -o-transition: background .25s ease-in-out; - -transition: background .25s ease-in-out; - - &:hover { - background: rgba(0,0,0,.9); - color:#31c0be; - } - } -} #page-dashboard { width: 100%; padding: 5px 15px; } -.main-wrapper { - transition: all 0.4s ease 0s; -} - .main-wrapper-pad { - padding-left: 220px; padding-top: 50px; } @@ -65,25 +26,10 @@ padding:5px 85px; } -@media (max-width:767px) { +@media (max-width:910px) and (min-width:768px) { .main-wrapper{ - padding-left: 0; - } - - #sidebar-wrapper { - left: 0; - } - - .main-wrapper.active { - position: relative; - left: 250px; - } - - .main-wrapper.active #sidebar-wrapper { - left: 250px; - width: 250px; - transition: all 0.4s ease 0s; + padding-top: 75px; } } diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb index 0211de9e..70ed1350 100644 --- a/app/views/layouts/_navbar.html.erb +++ b/app/views/layouts/_navbar.html.erb @@ -16,7 +16,7 @@