From 63347ea4172c0f9edf20dbb8fd1adc7d0b50aced Mon Sep 17 00:00:00 2001
From: Sara Cousin <sara.cousin@etu.unige.ch>
Date: Sun, 26 Apr 2020 13:40:14 +0200
Subject: [PATCH 1/2] deployement automatique des merges requests

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 87f66b1..9a200c1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ staging:
     script:
         - dpl --provider=heroku --app=$HEROKU_STAGING_APP --api-key=$HEROKU_STAGING_API_KEY
     only: 
-        - staging
+        - merge_requests
 
 production:
     type: deploy
-- 
GitLab


From f183c969c4f62e8c4b81dfa3f14dffa4d7dbb17d Mon Sep 17 00:00:00 2001
From: Sara Cousin <sara.cousin@etu.unige.ch>
Date: Sun, 26 Apr 2020 13:40:47 +0200
Subject: [PATCH 2/2] menu text color black

---
 src/app/header/header.component.css | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/header/header.component.css b/src/app/header/header.component.css
index 4d8f50f..d006438 100644
--- a/src/app/header/header.component.css
+++ b/src/app/header/header.component.css
@@ -16,6 +16,7 @@
   padding: 0;
   height: 75vh;
   max-height: 600px;
+  color: black;
 }
 
 .col {
@@ -25,6 +26,7 @@
 }
 
 .nav__item {
+
 }
 
 .nav__link--selected {
@@ -73,11 +75,11 @@ select:hover {
 
 option {
   border: 0;
-  border-bottom: 1px solid #595e63;
+  border-bottom: 1px solid #8C93D8;
   -webkit-appearance: none;
   -moz-appearance: none;
   background: none;
-  background-color: #595e63;
+  background-color: #8C93D8;
 }
 
 .selector {
-- 
GitLab