Merging m1 and m2 in a way

diff --git a/css/mock1.css b/css/mock1.css
index 2e154505f8a6b90411ae89404e4d9d53a983703c..cd7a297d440eab704b1e34f231f97dc258618b80 100644 (file)
--- a/css/mock1.css
+++ b/css/mock1.css
@@ -1,7 +1,8 @@
 /* vars */
 :root {
   --navbar-bg: white;
-  --jumbotron-bg: rgba(75,235,74,.4);
+  --jumbotron-bg: 15,75,14;
+  --jumbotron-bg-fall: 65,225,64;
   --footer-bg: 36,62,22;
   --copyright-bg: 0,0,0;
   --link-color: #428bca;
@@ -73,10 +74,7 @@ a {
 
 /* main */
 .container {
-  margin-top: 50px;
-  margin-left: 0;
-  margin-right: 0;
-  margin-bottom: 0;
+  margin: 50px 0 0 0;
   padding: 0;
   width: 100%; 
   margin-left: 0;
@@ -85,12 +83,18 @@ a {
   flex-direction: column;
   fkex-wrap: wrap;
   justify-content: space-between;
+  min-height: 100%;
 }
 
 /* jumbotron */
 .jumbotron {
-  background: var(--jumbotron-bg);
+  position: relative;
+  border-bottom: 1px solid #888;
   width: 100%;
+  background: rgb(var(--jumotron-bg-fall));
+  background: rgba(var(--jumbotron-bg),.6);
+  box-shadow: 0 3px 5px rgba(0,0,0, 0.36);
+  
   flex-basis: 100%;
   -webkit-border-bottom-right-radius: var(--box-round);
   -webkit-border-bottom-left-radius: var(--box-round);

diff --git a/index_mock1.html b/index_mock1.html
index f41cfa35f1118d0549ff305b6429a8c29b7fde7a..f2f09a2d6bcc11127a7be848689f36d8cd7f3037 100644 (file)
--- a/index_mock1.html
+++ b/index_mock1.html
@@ -17,7 +17,7 @@
     
     <div class="container">
         <div class="jumbotron">
-            <h2 class="child">I want to...</h2>
+            <h2 class="child"> welcomr to fn, I want to...</h2>
             <div class="box-container">
                 <a href="about" class="box">
                     <img src="" alt="chat" height="60px" width="60px" /><br />