Merge branch 'dev-groupe-01' of https://github.com/maximesahagian/PRJ…

…-medtec_androidapp into dev-groupe-01 # Conflicts: # web/public/css/app.css
echopen · Jul 6, 2017 · 332cb4e · 332cb4e
2 parents 57a05a5 + d59cb0f
commit 332cb4e
Show file tree

Hide file tree

Showing 16 changed files with 326 additions and 10,991 deletions.
diff --git a/web/public/css/app.css b/web/public/css/app.css
diff --git a/web/resources/assets/sass/app.scss b/web/resources/assets/sass/app.scss
@@ -25,6 +25,7 @@ body>.container {
     max-width: 1440px;
     padding: 0;
     width: 100%;
+    overflow: hidden;
 }
 
 @import "./components/numbers";

diff --git a/web/resources/assets/sass/components/contact/contact.scss b/web/resources/assets/sass/components/contact/contact.scss
@@ -52,6 +52,8 @@ body {
         }
         .left {
             margin-bottom: 20px;
+            display: inline-flex;
+            width: 100%;
         }
         display: table-cell;
         width: 50%;
@@ -60,11 +62,13 @@ body {
         form {
             width: 90%;
             margin: 0 auto;
+                padding-left: 15px;
+    padding-right: 15px;
         }
         .input-name {
-            width: 48%;
+            width: 100%;
             height: 70px;
-            margin-right: 16px;
+            margin-right: 19px;
             border: transparent;
             &::-webkit-input-placeholder {
                 padding-left: 25px;
@@ -74,12 +78,11 @@ body {
             }
             @include phone() {
                 width: 100%;
-                border: 1px solid $greyfirst;
-                margin-bottom: 2px;
+                margin-bottom: 15px;
             }
         }
         .input-email {
-            width: 48%;
+            width: 100%;
             height: 70px;
             border: transparent;
             &::-webkit-input-placeholder {
@@ -90,8 +93,7 @@ body {
             }
             @include phone() {
                 width: 100%;
-                border: 1px solid $greyfirst;
-                margin-bottom: 2px;
+                margin-bottom: 15px;
             }
         }
         textarea {
@@ -107,8 +109,7 @@ body {
             }
             @include phone() {
                 width: 100%;
-                border: 1px solid $greyfirst;
-                margin-bottom: 2px;
+                margin-bottom: 15px;
             }
         }
         .input-submit {
@@ -130,7 +131,7 @@ body {
         position: absolute;
         z-index: -1;
         height: 70px;
-        width: 41%;
+        width: 33%;
         opacity: 0.2;
         -webkit-filter: blur(20px);
         filter: blur(20px);
@@ -139,6 +140,10 @@ body {
             margin-top: 20px;
             height: 200px;
         }
+        @include phone() {
+            width: 85%;
+            height: 170px;
+        }
     }
     .input-submit {
         background-color: $mainblue;

diff --git a/web/resources/assets/sass/components/faq.scss b/web/resources/assets/sass/components/faq.scss
@@ -1,12 +1,12 @@
 .base_section-faq {
     .entry_wrapper-small {
-        @include phone() {
+        @media screen and(max-width: 990px){
             padding: 0 15px;
         }
         .alignleft {
             width: 26%;
             margin-left: 8.429em;
-            @include phone() {
+            @media screen and(max-width: 990px){
                 width: 100%;
                 margin: 0 auto;
                 display: block;
@@ -15,10 +15,10 @@
         .alignright {
             width: 62%;
             height: 0;
-            @include phone() {
+            @media screen and(max-width: 990px){
                 width: 100%;
-    margin: 0 auto;
-    display: initial;
+                margin: 0 auto;
+                display: initial;
                 height: auto;
             }
         }
@@ -39,14 +39,17 @@
         transform: translateY(-50%);
         z-index: -1;
         float: right;
-        @include phone() {
+        @media screen and(max-width: 990px){
             display: none;
         }
     }
     .entry_title {
         top: initial;
         transform: none;
         margin-top: 150px;
+        @include tablet {
+            margin-top: 0;
+        }
     }
     .entry_more {
         a {
@@ -57,7 +60,7 @@
         top: -50%;
         position: relative;
         transform: translateY(50%);
-        @include phone() {
+        @media screen and(max-width: 990px){
             transform: none;
             top: initial;
             margin: 50px 0;
@@ -66,4 +69,21 @@
     .base_btn {
         margin-top: 80px;
     }
+    .base_item-content {
+        .base_item-title a {
+            color: #545454;
+            font-size: 25px;
+            text-transform: uppercase;
+        }
+        p {
+            font-size: 14px;
+        }
+        .base_item-more {
+            color: #17EAD9;
+            &:after {
+                content: ">";
+                margin-left: 10px;
+            }
+        }
+    }
 }