Merge branch 'release/v1.7.0' of https://github.com/bcgov/EDUC-SDCI i…

…nto sdci-112
bcgov · Apr 19, 2024 · fc52945 · fc52945
2 parents d54c056 + dce5017
commit fc52945
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 15 deletions.
diff --git a/frontend/src/assets/main.css b/frontend/src/assets/main.css
@@ -70,16 +70,18 @@ button.link-btn, .link-btn .v-btn__content {
   justify-content: normal !important;
 }
 
-@media (max-width: 768px) {
-  #app {
-    /* min-width: 600px; */
-    padding: 0; /* Adjust as needed */
-  }
-
+@media (max-width: 1024px) {
   .full-width {
     margin-left: unset;
     margin-right: unset;
   }
+}
+
+@media (max-width: 960px) {
+  #app {
+    /* min-width: 600px; */
+    padding: 0; /* Adjust as needed */
+  }
 
   .breadcrumbs {
     margin: 0;

diff --git a/frontend/src/components/SchoolSelect.vue b/frontend/src/components/SchoolSelect.vue
@@ -43,7 +43,7 @@ function goToSchoolSearch() {
             src="@/assets/images/BCMapGraphic.png"
             alt="Map of British Columbia"
             style="height: 268px; position: absolute; top: 170px; left: -80px"
-            class="d-none d-md-block"
+            class="d-none d-lg-block"
           />
         </v-col>
         <v-col cols="10" md="8" xl="6" class="ml-0 py-6 school-search">
@@ -74,7 +74,7 @@ function goToSchoolSearch() {
             </v-col>
           </v-row>
           <v-row>
-            <v-col class="px-0 py-4 py-md-0 my-md-1">
+            <v-col cols="12" md="4" class="px-0 py-4 py-md-0 my-md-1">
               <v-btn
                 block
                 color="bcGovBlue"
@@ -86,7 +86,7 @@ function goToSchoolSearch() {
               >
             </v-col>
             <v-spacer class="d-none d-md-block" />
-            <v-col class="px-0 py-4 py-md-0 my-md-1">
+            <v-col cols="12" md="4" class="px-0 py-4 py-md-0 my-md-1">
               <DownloadSchoolsModal></DownloadSchoolsModal>
             </v-col>
           </v-row>

diff --git a/frontend/src/views/AuthorityView.vue b/frontend/src/views/AuthorityView.vue
@@ -214,8 +214,8 @@ onMounted(async () => {
     ></v-breadcrumbs>
     <v-sheet style="z-index: 100; position: relative" elevation="2" class="py-6 full-width">
       <v-container id="main">
-        <DisplayAlert class="mx-4 mx-md-0" />
-        <v-row no-gutters justify="space-between" class="pa-4 pa-md-0">
+        <DisplayAlert class="mx-4 mx-lg-0" />
+        <v-row no-gutters justify="space-between" class="pa-4 pa-md-5 pa-lg-0">
           <v-col cols="12">
             <h1 class="mt-1 mt-md-3 mb-6 mb-md-2">
               <span class="d-inline d-md-none">Authority </span>

diff --git a/frontend/src/views/DistrictView.vue b/frontend/src/views/DistrictView.vue
@@ -194,8 +194,8 @@ onMounted(async () => {
 
     <v-sheet style="z-index: 100; position: relative" elevation="2" class="py-6 full-width">
       <v-container id="main">
-        <DisplayAlert class="mx-4 mx-md-0" />
-        <v-row no-gutters justify="space-between" class="pa-4 pa-md-0">
+        <DisplayAlert class="mx-4 mx-lg-0" />
+        <v-row no-gutters justify="space-between" class="pa-4 pa-md-5 pa-lg-0">
           <v-col cols="12" v-if="district.value.districtData">
             <v-row no-gutters justify="space-between">
               <v-col>

diff --git a/frontend/src/views/SchoolView.vue b/frontend/src/views/SchoolView.vue
@@ -239,8 +239,13 @@ function goToDistrict() {
       class="pt-6 pb-0 pb-md-6 full-width"
     >
       <v-container id="main">
-        <DisplayAlert class="mx-4 mx-md-0" />
-        <v-row v-if="schoolData.value" no-gutters justify="space-between" class="pa-4 pa-md-0">
+        <DisplayAlert class="mx-4 mx-lg-1 mx-xl-0" />
+        <v-row
+          v-if="schoolData.value"
+          no-gutters
+          justify="space-between"
+          class="pa-4 pa-md-5 pa-lg-0"
+        >
           <v-col cols="11" md="12">
             <v-row no-gutters>
               <h1 class="mt-3 mb-2">