X-Git-Url: https://jfr.im/git/irc/freenode/web-7.0.git/blobdiff_plain/15d5b931e5d4e63ca13edc423896c85d7dd31007..86c4723971b605478d780f6239c7046e45565172:/css/mock1.css

diff --git a/css/mock1.css b/css/mock1.css
index d2164f614..dc3c2fe62 100644
--- a/css/mock1.css
+++ b/css/mock1.css
@@ -1,38 +1,35 @@
-<<<<<<< HEAD
-/* reset css for browser compat */
-* {
-    margin: 0;
-    padding: 0;
-    box-sizing: border-box;
-}
-
-body {
-  font-family: Verdana, Helvetica, sans-serif;
-  font-size: 16px;
-  color: #222222;
-=======
 /* vars */
 :root {
   --navbar-bg: white;
+  --jumbotron-bg: 15,75,14;
+  --jumbotron-bg-fall: 65,225,64;
+  --copyright-bg: 0,0,0;
+  --link-color: 66,139,202;
+  --footer-link-color: 32,32,32;
   --nlink-col: black;
-  --jumbotron-bg: rgba(75,235,74,.4);
-  --footer-bg: #eee;
-  --link-color: #428bca;
   --text-color: #333;
+  --footer-text-color: 255,255,255;
   --border-color: 0,0,0;
+  --footer-border-color: 255,255,255;
   --box-hover-color: #eee;
   --box-round: 10px;
 }
 
+/* reset css for browser compat */
+* {
+    margin: 0;
+    padding: 0;
+    box-sizing: border-box;
+}
+
 /* global */
 body {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: 'Open Sans';
   color: var(--text-color);
 }
 a {
-  color: var(--link-color);
+  color: rgb(var(--link-color));
   text-decoration: none;
->>>>>>> a76ce2ec5a7fbf382a09e6e87b16841374fe28a0
 }
 
 /* navbar */
@@ -46,6 +43,7 @@ a {
   top: 0;
   display: flex;
   flex-wrap: nowrap;
+  justify-content: space-between;
   align-items: center;
   border-bottom: 1px solid rgba(var(--border-color),.3);
   z-index: 100;
@@ -53,164 +51,82 @@ a {
 .nlogo {
   height: 40px;
 }
-/* navigation links */
 .navlinks {
-        position: relative;
-        display: table;
-        height: 50px;
-        margin: 0 20px;
-        list-style-type: none;
+  display: flex;
+  justify-content: space-around;
+  fkex-wrap: nowrap;
 }
-
-.navlinks > li {
+.nlink {
   text-decoration: none;
-<<<<<<< HEAD
-  font-size: 20px;
-  color: black;
-  float: left;
-  display: table-cell;
-  margin: 0 15px;
-  padding-top: 25px;
-  transform: translate(0, -25%); /* I have no idea how or why this works but it just does. */
-  cursor: pointer; /* for pseudo-links to still feel like links */
-=======
   color: var(--nlink-col);
->>>>>>> a76ce2ec5a7fbf382a09e6e87b16841374fe28a0
 }
 
 /* main */
 .container {
-  margin: 51px 0 0; /* merged margins into one */
+  margin: 50px 0 0 0;
   padding: 0;
   width: 100%; 
-<<<<<<< HEAD
-  position: relative;
-  height: auto;
-  min-height: 100%; /* height is needed for some properties */
-=======
   margin-left: 0;
   margin-right: 0;
-  position: static;
->>>>>>> a76ce2ec5a7fbf382a09e6e87b16841374fe28a0
+  min-height: 100%;
+}
+.main {
+  margin-left: 0.5em;
+  margin-right: 0.5em;
 }
 
 /* jumbotron */
 .jumbotron {
-<<<<<<< HEAD
-  color: white;
-  height: 50%;
-  width: 100%;
-  top: 50%;
-  margin: 5% 0;
   position: relative;
-  display: flex;
-  padding: 25px;
-  wrap-flex: wrap;
-  justify-content: center;
-  align-items: center;
-=======
-  background: var(--jumbotron-bg);
+  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);
+  color: white;
+  flex-basis: 100%;
   -webkit-border-bottom-right-radius: var(--box-round);
   -webkit-border-bottom-left-radius: var(--box-round);
   -moz-border-radius-bottomright: var(--box-round);
   -moz-border-radius-bottomleft: var(--box-round);
   border-bottom-right-radius: var(--box-round);
   border-bottom-left-radius: var(--box-round);
->>>>>>> a76ce2ec5a7fbf382a09e6e87b16841374fe28a0
 }
 .child {
   text-align: center;
 }
+.box-container {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-around;
+  align-items: stretch;
+}
 .box {
   text-align: center;
   text-decoration: none;
-<<<<<<< HEAD
-  color: black;
-  margin: 0 1%;
-  margin-bottom: 5px;
-  border: 1px solid #000;
-  height: 250px;
-  background-color: #fff;
-  border-radius: 10px;
-  width: 350px;
-  display: inline-block;
-=======
   color: var(--text-color);
   margin-bottom: 5px;
   border: 1px solid rgb(var(--border-color));
   flex-basis: 30%;
-  height: 105px;
+  /*height: 105px;*/
   background-color: #fff;
   border-radius: var(--box-round);
   -webkit-border-radius: var(--box-round);
   -moz-border-radius: var(--box-round);
->>>>>>> a76ce2ec5a7fbf382a09e6e87b16841374fe28a0
 }
-.box:hover, .box:active {
+.box:hover,
+.box:active {
   background-color: var(--box-hover-color);
 }
+.box-center {
+  margin-top: 22.5px;
+  margin-left: 5px;
+  margin-right: 5px;
+}
 .title {
   text-align: center;
 }
 
-/* a big welcome for newcomers ;) */
-.welcome-big {
-  position: relative;
-  margin-top: 51px;
-  border-bottom: 1px solid #888;
-  width: 100%;
-
-  background: rgb(65,225,64); /* fallback */
-  background: rgba(15, 75, 14, .6);
-
-  padding: 10%;
-
-  text-align: center;
-  color: white;
-  text-shadow: 0 3px 6px rgba(0,0,0, 0.16), 0 3px 6px rgba(0,0,0, 0.21);
-
-  box-shadow: 0 3px 5px rgba(0,0,0, 0.36);
-
-  height: 50%;
-
-  overflow: hidden;
-  vertical-align: bottom;
-}
-
-.welcome-big h1 { /* make this stand out */
-  font-size: 50px;
-  line-height: 80px;
-} 
-
-.welcome-big h3 {
-  font-size: 22px;
-  width: 70%;
-  margin: 0 auto;
-  vertical-align: middle;
-  }
-
-.welcome-learnmore {
-  border: 1px solid #666;
-  background-color: white;
-  font-size: 18px;
-  line-height: 24px;
-  font-weight: 400;
-
-  padding: 5px 8px;
-
-  border-radius: 8px;
-
-  box-shadow: 0 3px 6px rgba(0,0,0, 0.16), 0 3px 6px rgba(0,0,0, 0.21);
-
-  display: block;
-  position: relative;
-  margin: 0 auto;
-  vertical-align: middle;
-  bottom: -50%;
-  transform: translate(0, 50%);
-
-  }
 /* articles feed */
 h1 {
   margin: 0;
@@ -254,7 +170,8 @@ a.hchild {
   border-left: 1px solid rgba(var(--border-color),.6);
   border-right: 1px solid rgba(var(--border-color),.6);
 }
-a.hchild:hover, a.hchild:active {
+a.hchild:hover,
+a.hchild:active {
   background-color: var(--box-hover-color);
 }
 .hchild:first-child {
@@ -279,54 +196,69 @@ a.hchild:hover, a.hchild:active {
 
 /* footer */
 .footer {
-<<<<<<< HEAD
-  background: #666; /* >:^) */
-  width: 100%;
-  /* margin and padding are reset at line 1-5 */
+  background: rgba(var(--jumbotron-bg),.6);
+  color: rgba(var(--footer-text-color),.9);
+  margin-top: 1em;
   display: flex;
-  flex-wrap: wrap;
-  color: #eee;
-  font-size: 18px;
-  line-height: 22px;
-  
-  min-height: 22px;
-  height: auto;
-
-  position: fixed;
-  bottom: 0;
-} /* plz no justify ;_; */
-
-.footer a {
-  text-decoration: none;
-  color: #7bf;
-  }
-
-.footer-links {
-  position: absolute;
-  right: 0;
-  margin-right: 8px;
-  }
-=======
-  background: var(--footer-bg);
-  width: device-width;
-  margin: 0;
-  padding: 0;
-  display: flex;
-  flex-wrap: wrap;
+  flex-wrap: nowrap;
   justify-content: space-between;
   align-items: flex-start;
-/*  -webkit-border-top-left-radius: var(--box-round);
+  box-shadow: 0 -3px 5px rgba(0,0,0, 0.36);
+  -webkit-border-top-left-radius: var(--box-round);
   -webkit-border-top-right-radius: var(--box-round);
   -moz-border-radius-topleft: var(--box-round);
   -moz-border-radius-topright: var(--box-round);
   border-top-left-radius: var(--box-round);
-  border-top-right-radius: var(--box-round);*/
+  border-top-right-radius: var(--box-round);
+}
+.footerchild {
+  margin-top: 0.5em;
+  padding-left: 0.5em;
+  margin-right: 0.5em;
+}
+.footer a {
+  color: rgb(var(--footer-link-color));
+}
+@media all and (max-width: 500px) {
+  .footer {
+    flex-direction: column;
+  }
+  .footerchild {
+    width: 100%;
+    border-bottom: 1px solid rgba(var(--footer-border-color),.5);
+  }
+  .footerchild:last-child {
+  border: none;
+  }
+}
+.footerchild ul,
+.footerchild ul ul {
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+}
+.footerchild ul ul {
+  padding-left: 2em;
+}
+.footer h2, .footer h3 {
+margin: 0;
 }
 .footer .footerchild p {
   margin: 0;
 }
-.footerline {
-  border-right: 1px solid #000;
-  height: 100%;
+.copyright {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  background: rgba(var(--copyright-bg),.5);
+  height: 31px;
+  color: rgba(var(--footer-text-color),.9);
 }
->>>>>>> a76ce2ec5a7fbf382a09e6e87b16841374fe28a0
+a.copyright {
+  background: rgba(var(--copyright-bg),.5);
+  margin-bottom: 0;
+  margin-top: 0;
+  margin-left: 0.5em;
+  margin-right: 0.5em;
+}
\ No newline at end of file