Skip to content

Commit

Permalink
Remove vertical scrollbar on ride request page
Browse files Browse the repository at this point in the history
Remove Bulma

Closes #11
  • Loading branch information
xaviablaza committed Oct 14, 2018
1 parent cfc50a8 commit b36654b
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 13 deletions.
6 changes: 3 additions & 3 deletions app/javascript/application.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import 'csafe/css-v2/ride-request.scss';
@import 'mapbox/mapbox-gl.css';
@import '~bulma/sass/utilities/initial-variables.sass';
@import '~bulma/sass/utilities/functions.sass';
// @import '~bulma/sass/utilities/initial-variables.sass';
// @import '~bulma/sass/utilities/functions.sass';
@import 'uxsoc/styles/variables/variables';
@import '~bulma/bulma.sass';
// @import '~bulma/bulma.sass';
25 changes: 23 additions & 2 deletions app/javascript/csafe/css-v2/ride-request.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@
.ride-input {
height: 34vh;
.ride-container {
height: 100vh;
width: 100vw;
}

.map-container {
height: 66%;
width: 100%;
}

.ride-input {
height: 34%;
width: 100%;
background-color: #eceff5;
}

.logout-btn {
position: fixed;
top: 0;
right: 0;
}

body {
margin: 0;
padding: 0;
}
17 changes: 9 additions & 8 deletions app/views/ride/request_ride.html.slim
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
div Ride Request Page
= react_component("RiderMap")
div.ride-input
.field
.control
input.input type="text" placeholder="Enter pickup here"
input.input type="text" placeholder="Enter destination here"
= link_to('Logout', destroy_user_session_path, method: :delete)
.ride-container
.map-container
= react_component("RiderMap")
.ride-input
.field
.control
input.input type="text" placeholder="Enter pickup here"
input.input type="text" placeholder="Enter destination here"
= link_to('Logout', destroy_user_session_path, method: :delete, class: "logout-btn")

0 comments on commit b36654b

Please sign in to comment.