diff --git a/pinsisApp/src/app/hospital-selector/hospital-selector.component.scss b/pinsisApp/src/app/hospital-selector/hospital-selector.component.scss index 04ef480c7b4561ede79529963f0746027529a70f..262a3436d488bf245ea9fe41bc0829d07a5d547e 100644 --- a/pinsisApp/src/app/hospital-selector/hospital-selector.component.scss +++ b/pinsisApp/src/app/hospital-selector/hospital-selector.component.scss @@ -37,7 +37,7 @@ bottom: 20px; left: 20px; right: 20px; - overflow: scroll; + overflow-y: scroll; margin: 0; padding: 0; @@ -61,6 +61,7 @@ font-weight: bolder; text-decoration: none; + &:hover { cursor: pointer; background-color: $dark-purple; diff --git a/pinsisApp/src/app/maps-page/maps-page.component.html b/pinsisApp/src/app/maps-page/maps-page.component.html index 38ea384a3a3293be458d774752e5556e1a9ce2c3..e2fc9bde79f27bd2b7a41523789661efef7e4254 100644 --- a/pinsisApp/src/app/maps-page/maps-page.component.html +++ b/pinsisApp/src/app/maps-page/maps-page.component.html @@ -39,8 +39,13 @@ <div class="row row-hospital-selector"> + <div class="map-container"> + <div class="map-frame"> + <div id="map"></div> + </div> + </div> - <div class="col-12 col-md-4 hosp-col"> + <div class="col-12 col-md-4"> <button routerLink="/registro-hospital" class="register_button"> Cadastrar novo hospital </button> @@ -53,12 +58,6 @@ </div> </div> - <div class="map-container"> - <div class="map-frame"> - <div id="map"></div> - </div> - </div> - </div> diff --git a/pinsisApp/src/app/maps-page/maps-page.component.scss b/pinsisApp/src/app/maps-page/maps-page.component.scss index 645abae3dae0891ff4f2dc46b54baca5172a8e69..2d28f9406de46c391bfc9d7ce0d881dbb8b56c66 100644 --- a/pinsisApp/src/app/maps-page/maps-page.component.scss +++ b/pinsisApp/src/app/maps-page/maps-page.component.scss @@ -45,14 +45,11 @@ margin-left: auto; margin-right: auto; height: 285px; - max-height:600px; - - overflow-y: scroll; - background-color: #ffffff; + max-height:285px; + background-color: #ffffff; } .row-hospital-selector{ height:600px; - overflow:hidden; } .hosp-col{ @@ -63,17 +60,14 @@ .map-container { margin-top: 10px; width:92%; - max-height:400px; + height:400px; + margin-bottom: 10px; } .hospital-selector{ - max-height:600px; + height:400px; } .row-hospital-selector{ - height:850px; - overflow:hidden; - } - .hosp-col{ - max-height: 400px; + height:auto; } } diff --git a/pinsisApp/src/app/maps-page/maps-page.component.ts b/pinsisApp/src/app/maps-page/maps-page.component.ts index 6b504cead9d49493f41771311b57271fdc3343e9..27c986cf5a7228a175fd4011e4889b42e73d9300 100644 --- a/pinsisApp/src/app/maps-page/maps-page.component.ts +++ b/pinsisApp/src/app/maps-page/maps-page.component.ts @@ -141,7 +141,7 @@ export class MapsPageComponent implements AfterViewInit { }; let x = document.getElementById("hospital-card") x.style.display = "block" - console.log(this.selectedHospital) + //console.log(this.selectedHospital) } diff --git a/pinsisApp/src/app/register-hospital/register-hospital.component.scss b/pinsisApp/src/app/register-hospital/register-hospital.component.scss index 99ba0ef9a3701d245548babf372eed072e8fe49e..8a2a688694948fb3d1dc4abb54957aa0f1162d38 100644 --- a/pinsisApp/src/app/register-hospital/register-hospital.component.scss +++ b/pinsisApp/src/app/register-hospital/register-hospital.component.scss @@ -27,7 +27,6 @@ input { background-color: $white; border: 2px solid $text-dark; border-radius: 10px; - } .input-text { @@ -40,6 +39,11 @@ input { width: 45%; display: inline-block; margin-left: 3%; + + @media only screen and (max-width: $break-small) { + display: block; + width: 100%; + } } .submit-button { @@ -60,6 +64,11 @@ input { text-decoration: none; background: $dark-purple; } + @media only screen and (max-width: $break-small) { + width: 90%; + margin-left: 5%; + margin-right: 5%; + } } .file-input { @@ -83,6 +92,11 @@ input { background: $dark-purple; } + @media only screen and (max-width: $break-small) { + width: 90%; + margin-left: 5%; + margin-right: 5%; + } } .selected-image { @@ -92,4 +106,10 @@ input { margin-top: 20px; margin-left: 20px; + @media only screen and (max-width: $break-small) { + width: 94%; + margin-left: 3%; + margin-right: 3%; + margin-bottom: 10px; + } }