Merge branch 'dev'

octo-webf · Nov 30, 2017 · deaeefa · deaeefa
2 parents 18570fc + 4681a73
commit deaeefa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/client/src/components/JobHeader.vue b/client/src/components/JobHeader.vue
@@ -25,7 +25,7 @@
       <div class="job-header__filter-type">
         <div class="job-results__filters">
           <div class="filters_wrapper">
-            <!--<span class="job-filters-selector__text">Type de missions</span>-->
+            <span class="job-filters-selector__text">Type de missions</span>
             <mission-type-picker @selected="onSelectedMissionType"></mission-type-picker>
           </div>
         </div>
@@ -124,7 +124,7 @@
 
   @media only screen and (min-width: 640px) {
     .job-header__container {
-      height: 150px;
+      height: 170px;
       display: grid;
       width: 100%;
       grid-template-columns: 50% 50%;
@@ -134,7 +134,7 @@
 
   @media only screen and (min-width: 992px) {
     .job-header__container {
-      height: 100px;
+      height: 130px;
       display: grid;
       width: 100%;
       grid-template-columns: 33% 34% 33%;

diff --git a/client/src/components/MissionTypePicker.vue b/client/src/components/MissionTypePicker.vue
@@ -30,6 +30,13 @@
 <style>
   .dropdown-toggle.clearfix {
     background-color: white;
+    max-height: 67px;
+    min-height: 52px;
+    width: 220px;
+  }
+
+  .open-indicator {
+    top: 10px;
   }
 
   .mission-type-picker {