Merge branch 'develop' into feature/Digital/SSR-370

This commit is contained in:
Jethe 2023-04-11 18:56:55 +05:30
commit 98505cc0a3
17 changed files with 59 additions and 272 deletions

View file

@ -233,16 +233,6 @@ export default {
</script> </script>
<style lang="scss"> <style lang="scss">
// .button-question-overflow {
// height: calc(100vh - 274px);
//
// .overflow-scroll {
// // Height will be determined by overall height of content above list
// height: calc(100% - 400px);
// overflow-x: hidden !important;
// -webkit-overflow-scrolling: touch;
// }
// }
.button-question { .button-question {
color: $black; color: $black;

View file

@ -103,19 +103,7 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss">
.fade-on-route-transition {
margin-bottom: 100px;
}
.page-container-grouped-styles {
overflow: auto;
}
.modal-open {
.page-container-grouped-styles {
overflow: hidden;
}
}
.questions-page { .questions-page {
.question-text { .question-text {
margin-bottom: 0.5rem; margin-bottom: 0.5rem;

View file

@ -352,17 +352,3 @@ components: {
}, },
}; };
</script> </script>
<style lang="scss" scoped>
.fade-on-route-transition {
margin-bottom: 100px;
}
.page-container-grouped-styles {
overflow: auto;
}
.modal-open {
.page-container-grouped-styles {
overflow: hidden;
}
}
</style>

View file

@ -149,19 +149,7 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss">
.fade-on-route-transition {
margin-bottom: 100px;
}
.page-container-grouped-styles {
overflow: auto;
}
.modal-open {
.page-container-grouped-styles {
overflow: hidden;
}
}
ol { ol {
margin-left: -1rem; margin-left: -1rem;
li { li {

View file

@ -316,19 +316,7 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss">
.fade-on-route-transition {
margin-bottom: 100px;
}
.page-container-grouped-styles {
overflow: auto;
}
.modal-open {
.page-container-grouped-styles {
overflow: hidden;
}
}
#license-plate-question-wrapper .form-test-error { #license-plate-question-wrapper .form-test-error {
/** /**
Override extra margin-bottom in the error message in TextboxQuestion Override extra margin-bottom in the error message in TextboxQuestion

View file

@ -135,17 +135,6 @@ export default {
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.fade-on-route-transition {
height: calc(100% - 120px);
overflow: scroll;
overflow-x: hidden;
}
.modal-open {
.fade-on-route-transition {
overflow: hidden;
}
}
.alert.alert-warning .alert.alert-warning
{ {
margin-top: 20px; margin-top: 20px;

View file

@ -125,19 +125,7 @@ export default {
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss">
.fade-on-route-transition {
margin-bottom: 100px;
}
.page-container-grouped-styles {
overflow: auto;
}
.modal-open {
.page-container-grouped-styles {
overflow: hidden;
}
}
#sub-header span{ #sub-header span{
color: $black; color: $black;
} }

View file

@ -478,18 +478,3 @@ export default {
}, },
}; };
</script> </script>
<style lang="scss" scoped>
.fade-on-route-transition {
margin-bottom: 100px;
}
.page-container-grouped-styles {
overflow: auto;
}
.modal-open {
.page-container-grouped-styles {
overflow: hidden;
}
}
</style>

View file

@ -106,18 +106,3 @@ export default {
}, },
}; };
</script> </script>
<style lang="scss" scoped>
.fade-on-route-transition {
margin-bottom: 100px;
}
.page-container-grouped-styles {
overflow: auto;
}
.modal-open {
.page-container-grouped-styles {
overflow: hidden;
}
}
</style>

View file

@ -100,18 +100,3 @@ export default {
} }
}; };
</script> </script>
<style lang="scss" scoped>
.fade-on-route-transition {
margin-bottom: 80px;
}
.page-container-grouped-styles {
overflow: auto;
}
.modal-open {
.page-container-grouped-styles {
overflow: hidden;
}
}
</style>

View file

@ -109,21 +109,3 @@ export default {
}, },
}; };
</script> </script>
<style lang="scss" scoped>
.container-fluid {
margin-bottom: 80px;
}
.fade-on-route-transition {
margin-bottom: 80px;
}
.page-container-grouped-styles {
overflow: auto;
}
.modal-open {
.page-container-grouped-styles {
overflow: hidden;
}
}
</style>

View file

@ -232,20 +232,7 @@ components: {
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss">
.fade-on-route-transition {
margin-bottom: 100px;
}
.page-container-grouped-styles {
overflow: auto;
}
.modal-open {
.page-container-grouped-styles {
overflow: hidden;
}
}
#vehicle-parts-alert { #vehicle-parts-alert {
.alert-heading { .alert-heading {
margin-top: 0.25rem !important; margin-top: 0.25rem !important;

View file

@ -122,21 +122,3 @@ export default {
} }
}; };
</script> </script>
<style lang="scss" scoped>
.container-fluid {
margin-bottom: 80px;
}
.fade-on-route-transition {
margin-bottom: 80px;
}
.page-container-grouped-styles {
overflow: auto;
}
.modal-open {
.page-container-grouped-styles {
overflow: hidden;
}
}
</style>

View file

@ -99,18 +99,3 @@ export default {
}, },
}; };
</script> </script>
<style lang="scss" scoped>
.fade-on-route-transition {
margin-bottom: 80px;
}
.page-container-grouped-styles {
overflow: auto;
}
.modal-open {
.page-container-grouped-styles {
overflow: hidden;
}
}
</style>

View file

@ -254,18 +254,3 @@ export default {
}, },
}; };
</script> </script>
<style lang="scss" scoped>
.fade-on-route-transition {
margin-bottom: 100px;
}
.page-container-grouped-styles {
overflow: auto;
}
.modal-open {
.page-container-grouped-styles {
overflow: hidden;
}
}
</style>

View file

@ -348,19 +348,7 @@ export default {
</script> </script>
<style lang="scss"> <style lang="scss">
.my-2 {
.fade-on-route-transition {
height: calc(100% - 80px);
overflow: scroll;
}
.modal-open {
.fade-on-route-transition {
overflow: hidden;
}
}
.my-2
{
margin-bottom: 0rem !important; margin-bottom: 0rem !important;
} }
@-moz-document url-prefix() { @-moz-document url-prefix() {

View file

@ -25,7 +25,6 @@ body {
.container-fluid { .container-fluid {
overflow: hidden; overflow: hidden;
} }
.sub-container{ .sub-container{
&.make-tall { &.make-tall {
height: 100%; height: 100%;
@ -35,7 +34,6 @@ body {
overflow-x: hidden; overflow-x: hidden;
} }
} }
.sr-only { .sr-only {
position: absolute; position: absolute;
left: -10000px; left: -10000px;
@ -44,11 +42,9 @@ body {
height: 1px; height: 1px;
overflow: hidden; overflow: hidden;
} }
.page-container-grouped-styles { .page-container-grouped-styles {
@extend .container-fluid, .shadow, .p-0, .position-relative, .make-tall; @extend .container-fluid, .shadow, .p-0, .position-relative, .make-tall;
} }
//Footer modal backdrop adjustments for positioning //Footer modal backdrop adjustments for positioning
.modal-backdrop { .modal-backdrop {
left: 50%; left: 50%;
@ -56,5 +52,15 @@ body {
max-width: 576px; max-width: 576px;
height: calc(100% - 72px); height: calc(100% - 72px);
} }
// Scroll page when modal isn't open
.fade-on-route-transition {
height: calc(100% - 80px);
overflow: auto;
}
// Prevent scroll when modal is open
.modal-open {
.fade-on-route-transition {
overflow: hidden;
}
}
} }