X-Git-Url: https://jfr.im/git/irc/freenode/web-7.0.git/blobdiff_plain/7e95bd69010e0256eb066cc82db99cc9605daa50..07383868bc2648939408767d1e450875193bc237:/css/mock1.css

diff --git a/css/mock1.css b/css/mock1.css
index d2164f614..c9a0a3115 100644
--- a/css/mock1.css
+++ b/css/mock1.css
@@ -1,4 +1,27 @@
-<<<<<<< HEAD
+/* vars */
+:root {
+    --navbar-bg: #fff;
+    /*--jumbotron-bg: 15,75,14;*/
+    /*--jumbotron-bg: rgba(75,235,74,.4);*/
+    --jumbotron-bg: rgb(238,238,238);
+    --jumbotron-bg-fall: 65,225,64;
+    --copyright-bg: 170,178,171;
+    --link-color: 66,139,202;
+    /*--footer-link-color: 255,255,255;*/
+    --footer-link-color: 51,51,51;
+    --nlink-col: #000;
+    --text-color: #333;
+    /*--footer-text-color: 255,255,255;*/
+    --footer-text-color: 51,51,51;
+    --copyright-text-color: 0,0,0;
+    --jumbotron-text-color: #333;
+    --border-color: 0,0,0;
+    /*--footer-border-color: 255,255,255;*/
+    --footer-border-color: 51,51,51;
+    --box-hover-color: #eee;
+    --box-round: 10px;
+}
+
 /* reset css for browser compat */
 * {
     margin: 0;
@@ -6,327 +29,264 @@
     box-sizing: border-box;
 }
 
-body {
-  font-family: Verdana, Helvetica, sans-serif;
-  font-size: 16px;
-  color: #222222;
-=======
-/* vars */
-:root {
-  --navbar-bg: white;
-  --nlink-col: black;
-  --jumbotron-bg: rgba(75,235,74,.4);
-  --footer-bg: #eee;
-  --link-color: #428bca;
-  --text-color: #333;
-  --border-color: 0,0,0;
-  --box-hover-color: #eee;
-  --box-round: 10px;
-}
-
 /* global */
 body {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  color: var(--text-color);
+    font-family: 'Open Sans';
+    color: var(--text-color);
+    font-size: 14px;
 }
+
 a {
-  color: var(--link-color);
-  text-decoration: none;
->>>>>>> a76ce2ec5a7fbf382a09e6e87b16841374fe28a0
+    color: #000;
+    text-decoration: none;
 }
 
 /* navbar */
 .navbar {
-  width: 100%;
-  height: 50px;
-  background-color: var(--navbar-bg);
-  position: fixed;
-  left: 0;
-  right: 0;
-  top: 0;
-  display: flex;
-  flex-wrap: nowrap;
-  align-items: center;
-  border-bottom: 1px solid rgba(var(--border-color),.3);
-  z-index: 100;
+    width: 100%;
+    height: 50px;
+    background-color: var(--navbar-bg);
+    position: fixed;
+    left: 0;
+    right: 0;
+    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;
 }
+
 .nlogo {
-  height: 40px;
+    height: 40px;
 }
-/* navigation links */
+
 .navlinks {
-        position: relative;
-        display: table;
-        height: 50px;
-        margin: 0 20px;
-        list-style-type: none;
-}
-
-.navlinks > li {
-  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
+    display: flex;
+    justify-content: space-around;
+    fkex-wrap: nowrap;
+}
+
+.nlink {
+    text-decoration: none;
+    color: var(--nlink-col);
 }
 
 /* main */
 .container {
-  margin: 51px 0 0; /* merged margins into one */
-  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
+    margin: 50px 0 0;
+    padding: 0;
+    width: 100%;
+    min-height: 100%;
+}
+
+.main {
+    margin-left: .5em;
+    margin-top: 1em;
 }
 
 /* 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);
-  width: 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
+    position: relative;
+    width: 100%;
+    background: #000;
+    background: var(--jumbotron-bg);
+    box-shadow: 0 3px 5px rgba(150,150,150,.36);
+    color: var(--jumbotron-text-color);
 }
+
 .child {
-  text-align: center;
+    text-align: center;
+    margin: .5em;
 }
-.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;
-  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 {
-  background-color: var(--box-hover-color);
-}
-.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;
+.box-container {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+    align-items: stretch;
 }
 
-.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;
+.box {
+    text-align: center;
+    text-decoration: none;
+    color: var(--text-color);
+    margin-bottom: 5px;
+    flex-basis: 30%;
+    background-color: #fff;
+    border-radius:  var(--box-round);
+    -webkit-border-radius: var(--box-round);
+    -moz-border-radius: var(--box-round);
+}
 
-  padding: 5px 8px;
+.box:hover,.box:active {
+    background-color: var(--box-hover-color);
+}
 
-  border-radius: 8px;
+.fa-users {
+    margin-top: 5px;
+}
 
-  box-shadow: 0 3px 6px rgba(0,0,0, 0.16), 0 3px 6px rgba(0,0,0, 0.21);
+.fa-comment,.fa-question {
+    margin-bottom: 5px;
+}
 
-  display: block;
-  position: relative;
-  margin: 0 auto;
-  vertical-align: middle;
-  bottom: -50%;
-  transform: translate(0, 50%);
+.title {
+    text-align: center;
+}
 
-  }
 /* articles feed */
 h1 {
-  margin: 0;
+    margin: 0;
 }
+
 div.art {
-  border-bottom: 1px solid rgba(var(--border-color),.3);
+    border-bottom: 1px solid rgba(var(--border-color),.3);
+    
 }
 div.art:last-child {
-  border-bottom: none;
+    border-bottom: none;
 }
+
 h3.art {
-  margin-bottom: 0;
+    margin-bottom: 0;
 }
+
 p.art {
-  margin: 0;
+    margin: 0;
 }
+
 p.art-ingress {
-  font-style: italic;
-  margin: 0;
+    font-style: italic;
+    margin: 0;
 }
-p.art-date {
-  color: #ccc;
-  margin: 0;
+
+.art-date {
+    color: #ccc;
+    margin: 0;
 }
+
 p.art-link {
-  margin-top: 0;
+    margin-top: 0;
 }
 
 /* help */
 .hmain {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: space-around;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+    align-items: stretch;
 }
+
 a.hchild {
-  color: var(--text-color);
-  height: 40px;
-  width: 95%;
-  text-align: center;
-  border-top: 1px solid rgba(var(--border-color),.6);
-  border-left: 1px solid rgba(var(--border-color),.6);
-  border-right: 1px solid rgba(var(--border-color),.6);
+    color: var(--text-color);
+/*height: 40px;*/
+    width: 95%;
+    text-align: center;
+    border-top: 1px solid rgba(var(--border-color),.6);
+    border-left: 1px solid rgba(var(--border-color),.6);
+    border-right: 1px solid rgba(var(--border-color),.6);
 }
-a.hchild:hover, a.hchild:active {
-  background-color: var(--box-hover-color);
+
+a.hchild:hover,a.hchild:active {
+    background-color: var(--box-hover-color);
 }
+
 .hchild:first-child {
-  margin-top: 10px;
-  -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);
+    margin-top: 10px;
+    -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);
 }
+
 .hchild:last-child {
-  margin-bottom: 10px;
-  border-bottom: 1px solid rgba(var(--border-color),.6);
-  -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);
+    margin-bottom: 10px;
+    border-bottom: 1px solid rgba(var(--border-color),.6);
+    -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);
 }
 
 /* footer */
 .footer {
-<<<<<<< HEAD
-  background: #666; /* >:^) */
-  width: 100%;
-  /* margin and padding are reset at line 1-5 */
-  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 ;_; */
+    background: var(--jumbotron-bg);
+    color: rgba(var(--footer-text-color),.9);
+    margin-top: 1em;
+    display: flex;
+    flex-wrap: nowrap;
+    justify-content: space-between;
+    align-items: flex-start;
+    box-shadow: 0 -3px 5px rgba(150,150,150,.36);
+}
+
+.footerchild {
+    margin-top: .5em;
+}
 
 .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;
-  justify-content: space-between;
-  align-items: flex-start;
-/*  -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);*/
-}
-.footer .footerchild p {
-  margin: 0;
-}
-.footerline {
-  border-right: 1px solid #000;
-  height: 100%;
-}
->>>>>>> a76ce2ec5a7fbf382a09e6e87b16841374fe28a0
+    color: #000;
+}
+
+.footerchild ul,
+.footerchild ul ul {
+    margin-left: 10px;
+    margin-right: 10px;
+    list-style-type: none;
+}
+
+.footerchild ul ul {
+    padding-left: 30px;
+}
+
+@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 li:last-child {
+        margin-bottom: .5em;
+    }
+}
+
+.footer h2,.footer h3 {
+    margin-left: 10px;
+    margin-right: 10px;
+}
+
+.flex-right {
+    align-self: flex-end;
+}
+
+.copyright {
+    display: flex;
+    flex-wrap: nowrap;
+    justify-content: space-between;
+    align-items: center;
+    background: rgba(var(--copyright-bg),.5);
+    height: 31px;
+    color: rgba(var(--copyright-text-color),.8);
+}
+
+a.copyright {
+    background: rgba(var(--copyright-bg),.5);
+    margin-bottom: 0;
+    margin-top: 0;
+    margin-left: .5em;
+    margin-right: .5em;
+}
\ No newline at end of file