Merge pull request #27 from elixir-europe/elixir-bsc

Elixir bsc
elixir-europe · Nov 30, 2023 · 1395986 · 1395986
2 parents 97a0bbd + 55baca8
commit 1395986
Show file tree

Hide file tree

Showing 3 changed files with 87 additions and 17 deletions.
diff --git a/.github/workflows/push_docker_image.yml b/.github/workflows/push_docker_image.yml
@@ -32,11 +32,17 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            # set latest tag for master branch
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'elixir-bsc') }}
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
-          # Indicates that the Docker build context is the current directory.
-          # Otherwise, it would be a Git URL (doing a separate clean checkout).
           context: ./frontend
           push: true
           tags: ${{ steps.meta.outputs.tags }}

diff --git a/frontend/src/App.css b/frontend/src/App.css
@@ -84,7 +84,6 @@ html {
   font-size: 14px;
 }
 
-
 .container-fluid {
   display: flex;
   width: 100%;
@@ -774,7 +773,8 @@ h5 {
 .advSearch-module {
   display: flex;
   align-items: center;
-  margin-top: -3px;
+  margin-top: 6px;
+  margin-bottom: -2px;
 }
 
 .loader2 {

diff --git a/frontend/src/components/Individuals/Individuals.css b/frontend/src/components/Individuals/Individuals.css
@@ -1,4 +1,3 @@
-
 .resultsIndividuals {
   display: flex;
   margin-top: 9px;
@@ -319,25 +318,31 @@ h4 {
   }
 }
 
-@media (min-width: 872px){
+@media (min-width: 872px) {
   .tittleResults h1 {
     font-size: 12px;
     color: black !important;
   }
 
+  .multi-switch-container {
+    width: 237px !important;
+    background-color: white;
+    border-color: black;
+    height: 29px !important;
+    margin-left: 14px;
+    z-index: 0;
+  }
 
-.multi-switch-container {
-  width: 237px !important;
-  background-color: white;
-  border-color: black;
-  height: 29px !important;
-  margin-left: 14px;
-  z-index: 0;
-}
-
+  .advSearch-module .multi-switch-container {
+    width: 195px !important;
+    background-color: white;
+    border-color: black;
+    height: 29px !important;
+    margin-left: 14px;
+    z-index: 0;
+  }
 }
 
-
 @media (max-width: 873px) {
   label {
     font-size: 10px;
@@ -353,6 +358,26 @@ h4 {
     align-items: center;
   }
 
+  .advSearch-module {
+    display: flex;
+    align-items: center;
+    margin-top: 11px;
+  }
+
+  .advSearch-module .multi-switch-container {
+    width: 183px !important;
+    background-color: white;
+    border-color: black;
+    height: 29px !important;
+    margin-left: 14px;
+    z-index: 0;
+  }
+
+  .advSearch-module .multi-switch-container label {
+    font-size: 10px !important;
+    width: 56px !important;
+  }
+
   .selectGranularity {
     align-items: center;
     display: flex;
@@ -372,7 +397,7 @@ h4 {
   .multi-switch-container label {
     font-size: 10px !important;
     width: 53px !important;
-}
+  }
 
   .multi-switch-container span {
     width: 45px !important;
@@ -390,3 +415,42 @@ h4 {
     z-index: 0;
   }
 }
+
+@media (max-width: 763px) {
+  .multi-switch-container {
+    width: 219px !important;
+    background-color: white;
+    border-color: black;
+    height: 29px !important;
+    margin-left: -4px;
+    z-index: 0;
+    margin-bottom: 8px;
+  }
+
+  .resultSetsDiv {
+    display: flex;
+    flex-direction: column;
+    align-content: center;
+    justify-content: center;
+    align-items: flex-start;
+  }
+
+  .switchDescendants {
+    display: flex;
+    align-items: center;
+    margin-left: 2px;
+    justify-content: center;
+    align-content: center;
+  }
+
+  .advContainer {
+    display: flex;
+    width: 100vw;
+    /* flex-direction: column; */
+    /* align-items: flex-start; */
+    /* margin-right: 58px; */
+    align-content: center;
+    justify-content: center;
+    margin-right: 0px;
+  }
+}