diff --git a/html/css/stylesheet.css b/html/css/stylesheet.css index c02399c..d2fe167 100644 --- a/html/css/stylesheet.css +++ b/html/css/stylesheet.css @@ -1,6 +1,7 @@ body{ background-color: #94969A; padding-top: 50px; + height: 100vh; } a.divlink{ diff --git a/html/javascript/navbar.js b/html/javascript/navbar.js index cd96e8f..66a150b 100644 --- a/html/javascript/navbar.js +++ b/html/javascript/navbar.js @@ -1 +1 @@ -document.getElementById('navbaruniversal').innerHTML = '
' \ No newline at end of file +document.getElementById('navbaruniversal').innerHTML = '
' \ No newline at end of file diff --git a/html/javascript/request.js b/html/javascript/request.js index 013bc49..4efcdf7 100644 --- a/html/javascript/request.js +++ b/html/javascript/request.js @@ -66,7 +66,7 @@ function show(){ //iterate through the hardcoded device DB and select all the ones that match the selected option for(var i = 0; i < devices.length; i++){ if((type.localeCompare(devices[i].hardware) == 0 || type.localeCompare(devices[i].software) == 0) && !isUnavailable(i)){ - html += '
' + devices[i].name + '

' + devices[i].description + '


' + html += '
' + devices[i].name + '

' + devices[i].description + '



' } } diff --git a/html/javascript/shoppingCart.js b/html/javascript/shoppingCart.js index 95a8ed1..d170c72 100644 --- a/html/javascript/shoppingCart.js +++ b/html/javascript/shoppingCart.js @@ -75,6 +75,7 @@ function show(){ var cart = getCartItems(); //get all the cart items you want to show var html = ''; //html string initially empty if(cart.length !== 0){ //only continue if there are cart items + html += '

Tickets have been generated below based on your desired selections.


' for(var i = 0; i < cart.length; i++){ //iterate cart var id = cart[i]; //this gets the id value from the cart for(var j = 0; j < devices.length; j++){ //iterate device list diff --git a/html/webpages/requestPage.html b/html/webpages/requestPage.html index 25b8392..bf536c8 100644 --- a/html/webpages/requestPage.html +++ b/html/webpages/requestPage.html @@ -18,6 +18,9 @@ display: inline-block; position: absolute; padding-left: 30px; + overflow-y: scroll; + width: 100%; + height: 100%; } div.deviceContainer{ @@ -25,6 +28,7 @@ border-width: thin; padding: 15px; background-color: #E9EAEB; + display: inline-block; } div.imgContainer{ @@ -40,7 +44,6 @@ display: inline-block; width: 200px; text-align: center; - vertical-align: center; } button.requestbutton{ @@ -51,8 +54,7 @@ div.sidebar{ display: inline-block; border-right-style: solid; - height: 100%; - width: 200px; + height: 100vh; background-color: #E9EAEB; } @@ -61,13 +63,14 @@ top: 50%; left: 50%; position: fixed; - width: 100px; - height: 70px; - line-height: 70px; + width: 155px; + height: 85px; + line-height: 85px; text-align: center; background-color: #FBC600; border: solid; border-color: #3B3C43; + border-radius: 5px; } ul.nav{ diff --git a/html/webpages/shoppingCart.html b/html/webpages/shoppingCart.html index d41740d..1c895fb 100644 --- a/html/webpages/shoppingCart.html +++ b/html/webpages/shoppingCart.html @@ -18,8 +18,7 @@ div.sidebar{ display: inline-block; border-right-style: solid; - height: 100%; - width: 200px; + height: 100vh; background-color: #E9EAEB; } @@ -31,6 +30,7 @@ display: inline-block; position: absolute; padding-left: 30px; + width: 100%; } div.ticket{ @@ -57,9 +57,9 @@