]> jfr.im git - irc/freenode/web-7.0.git/commitdiff
merge
authorSvante Bengtson <redacted>
Tue, 23 Feb 2016 15:28:14 +0000 (16:28 +0100)
committerSvante Bengtson <redacted>
Tue, 23 Feb 2016 15:28:14 +0000 (16:28 +0100)
1  2 
static/css/mock1.css
templates/base.html
templates/index.html

diff --combined static/css/mock1.css
index 804f4160a66e45e4ecce5546e9962b409a3a8a0c,b728ad6b4773abe3acec919760db7cf3134d2bba..b991d4d9af1cbc2145f0c19bfae2a3048e0f50bf
@@@ -1,17 -1,22 +1,17 @@@
  /* 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: #eee;
      --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;
@@@ -23,7 -28,6 +23,7 @@@
      padding: 0;
      box-sizing: border-box;
  }
 +
  /* global */
  body {
      font-family: 'Open Sans';
@@@ -114,8 -118,9 +114,8 @@@ a 
      color: var(--text-color);
      margin-bottom: 5px;
      flex-basis: 30%;
 -   /* border: 1px solid rgba(var(--border-color), 0.39); */
      background-color: #fff;
 -    border-radius:  var(--box-round);
 +    border-radius: var(--box-round);
      -webkit-border-radius: var(--box-round);
      -moz-border-radius: var(--box-round);
  }
@@@ -143,8 -148,8 +143,8 @@@ h1 
  
  div.art {
      border-bottom: 1px solid rgba(var(--border-color),.3);
 -    
  }
 +
  div.art:last-child {
      border-bottom: none;
  }
@@@ -167,23 -172,13 +167,23 @@@ p.art-ingress 
      color: #ccc;
      margin: 0;
  }
 +
  p.heading {
      white-space: nowrap;
  }
 +
  p.art-link {
      margin-top: 0;
  }
  
-     line-height: 1.5em;
 +/* Article */
 +.art-full h1,
 +.art-full h2,
 +.art-full h3,
 +.art-full h4 {
++    ;
 +}
 +
  /* help */
  .hmain {
      display: flex;
@@@ -231,7 -226,6 +231,7 @@@ a.hchild:hover,a.hchild:active 
  .footers {
      min-height: 30vh;
  }
 +
  .footer {
      background: var(--jumbotron-bg);
      color: rgba(var(--footer-text-color),.9);
      display: inline-block;
  }
  
 -.footerchild ul,
 -.footerchild ul ul {
 +.footerchild ul,.footerchild ul ul {
      margin-left: 10px;
      margin-right: 10px;
      list-style-type: none;
      .footerchild {
          width: 100%;
      }
 -}
 +
      .footerchild ul li:last-child {
          margin-bottom: .5em;
      }
 +
      .hdn {
 -    display: none;
 +        display: none;
      }
  }
  
      height: 3vh;
      color: rgba(var(--copyright-text-color),.8);
  }
 +
  a.copyright {
      background: rgba(var(--copyright-bg),.5);
      margin-bottom: 0;
      width: auto;
      height: auto;
  }
 +
  .copyright a img {
      height: 3vh;
      width: auto;
  }
 +
  .copyright p {
      margin-bottom: 0;
      margin-top: 0;
      margin-right: .5em;
      text-align: right;
  }
 +
  @media all and (max-width: 500px) {
      .copyright {
          height: 5vh;
      }
 +
      .copyright a img {
          height: 5vh;
      }
 -}
 +}
diff --combined templates/base.html
index 63745bbbbd8daa18139a0c6245cc59b320e63178,8c9fca5e2abb8df57b36350519ea73ce5c4bfedb..f036c35a98153a394b53202653e6612fc82825d3
@@@ -1,4 -1,5 +1,4 @@@
  <!DOCTYPE html>
 -
  <html lang="en">
  <head>
      <meta charset="utf-8">
@@@ -6,11 -7,13 +6,11 @@@
      <meta content="width=device-width, initial-scale=1" name="viewport">
      <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
      <meta content="#fff" name="theme-color">
 -
 -    <title>{{ title }}</title>
 +    <title>freenode</title>
      <link href="static/css/open-sans.css" rel="stylesheet">
      <link href="static/css/style.css" rel="stylesheet">
      <link href="static/css/font-awesome.min.css" rel="stylesheet">
  </head>
 -
  <body>
      <nav class="navbar">
          <a href="index"><img alt="freenode" class="nlogo" src=
          "_blank"><img alt="Private internet access" class="nlogo" src=
          "static/img/logos/PIALogo_black.svg"></a>
      </nav>
 -
 -
      <div class="container">
-         <div class="jumbotron">
-             <h2 class="child">Welcome to freenode, the new home of your
-             projects.</h2>
-             <div class="box-container">
-                 <a class="box" href="about"><i class=
-                 "fa fa-comment fa-4x"></i><br>
-                 Chat</a> <a class="box" href="help"><i class=
-                 "fa fa-question fa-4x"></i><br>
-                 FAQ</a> <a class="box" href="contribute"><i class=
-                 "fa fa-users fa-4x"></i><br>
-                 Register a group</a>
-             </div>
 -        {% block content %}{% endblock %}
 -    </div>
 -
 -
 -    <footer class="footer">
 -        <div class="footerchild">
 -            <h2>About freenode</h2>
 -
 -
 -            <ul>
 -                <li>
 -                    <a>Vision</a>
 -                </li>
 -
 -
 -                <li>
 -                    <a>Mission</a>
 -                </li>
 -
 -
 -                <li>
 -                    <a>Philosophy</a>
 -                </li>
 -
 -
 -                <li>
 -                    <a>Policies</a>
 -                </li>
 -
 -
 -                <li>
 -                    <a>Credits</a>
 -                </li>
 -            </ul>
--        </div>
-         <div class="main">
 -
 -
 -        <div class="footerchild">
 -            <h2>Using freenode</h2>
 -
 -
 -            <ul>
 -                <li>
 -                    <a>Connect</a>
 -                </li>
 -
 -
 -                <li>
 -                    <a>Clients</a>
 -                </li>
 -
 -
 -                <li>
 -                    <a>Webchat</a>
 -                </li>
 -
 -
 -                <li>
 -                    <a>SASL</a>
 -                </li>
 -            </ul>
 -        </div>
 -
 -
 -        <div class="footerchild">
 -            <h2>Groups/Projects</h2>
 -
 -
 -            <ul>
 -                <li>
 -                    <a>Group Management System</a>
 -                </li>
 -
 -
 -                <li>
 -                    <a>Groups on freenode</a>
 -                </li>
 -
 -
 -                <li>
 -                    <a>How Groups Work</a>
 -                </li>
 -            </ul>
 -        </div>
 -
 -
 -        <div class="footerchild">
 -            <h2>Support freenode</h2>
 -
 -
 -            <ul>
 -                <li>
 -                    <a>Host a server</a>
 -                </li>
 -            </ul>
 +            {% block content %}{% endblock %}
          </div>
 -
 -        <div class="footerchild hdn">&nbsp;</div>
 -
 -
 -        <div class="footerchild">
 -            <h2>Social Media</h2>
 -
 -
 -            <ul>
 -                <li>
 -                    <a href="https://plus.google.com/104326727082310562426"
 -                    target="_blank"><i class="fa fa-google-plus"></i>
 -                    Google+</a>
 -                </li>
 -
 -
 -                <li>
 -                    <a href="https://twitter.com/freenodestaff" target=
 -                    "_blank"><i class="fa fa-twitter"></i> Twitter</a>
 -                </li>
 -
 -
 -                <li>
 -                    <a href="PIA" target="_blank"><img alt="PIA" height="14px"
 -                    src="static/img/logos/pia-robot-original.svg"> Private Internet
 -                    Access</a>
 -                </li>
 -            </ul>
 -        </div>
 -    </footer>
 -
 -
 -    <footer class="copyright">
 -        <a class="copyright" href=
 -        "https://creativecommons.org/licenses/by-nc-sa/4.0/" target=
 -        "_blank"><img alt="CC by-nc-sa" height="31px" src=
 -        "static/img/by-nc-sa.svg"></a>
 -
 -        <p>&copy; Copyright 2002-2016, freenode</p>
 -    </footer>
 +    </div>
 +    <div class="footers">
 +        <footer class="footer">
 +            <div class="footerchild">
 +                <h2>About freenode</h2>
 +                <ul>
 +                    <li>
 +                        <a>Vision</a>
 +                    </li>
 +                    <li>
 +                        <a>Mission</a>
 +                    </li>
 +                    <li>
 +                        <a>Philosophy</a>
 +                    </li>
 +                    <li>
 +                        <a>Policies</a>
 +                    </li>
 +                    <li>
 +                        <a>Credits</a>
 +                    </li>
 +                </ul>
 +            </div>
 +            <div class="footerchild">
 +                <h2>Using freenode</h2>
 +                <ul>
 +                    <li>
 +                        <a>Connect</a>
 +                    </li>
 +                    <li>
 +                        <a>Clients</a>
 +                    </li>
 +                    <li>
 +                        <a>Webchat</a>
 +                    </li>
 +                    <li>
 +                        <a>SASL</a>
 +                    </li>
 +                </ul>
 +            </div>
 +            <div class="footerchild">
 +                <h2>Groups/Projects</h2>
 +                <ul>
 +                    <li>
 +                        <a>Group Management System</a>
 +                    </li>
 +                    <li>
 +                        <a>Groups on freenode</a>
 +                    </li>
 +                    <li>
 +                        <a>How Groups Work</a>
 +                    </li>
 +                </ul>
 +            </div>
 +            <div class="footerchild">
 +                <h2>Support freenode</h2>
 +                <ul>
 +                    <li>
 +                        <a>Host a server</a>
 +                    </li>
 +                </ul>
 +            </div>
 +            <div class="footerchild hdn">
 +                &nbsp;
 +            </div>
 +            <div class="footerchild">
 +                <h2>Social Media</h2>
 +                <ul>
 +                    <li>
 +                        <a href="https://plus.google.com/104326727082310562426"
 +                        target="_blank"><i class="fa fa-google-plus"></i>
 +                        Google+</a>
 +                    </li>
 +                    <li>
 +                        <a href="https://twitter.com/freenodestaff" target=
 +                        "_blank"><i class="fa fa-twitter"></i> Twitter</a>
 +                    </li>
 +                    <li>
 +                        <a href=
 +                        "https://www.facebook.com/freenode-366911233325305/"
 +                        target="_blank"><i class="fa fa-facebook"></i>
 +                        Facebook</a>
 +                    </li>
 +                    <li>
 +                        <a href="PIA" target="_blank"><img alt="PIA" height=
 +                        "14px" src="static/img/logos/pia-robot-original.svg">
 +                        Private Internet Access</a>
 +                    </li>
 +                </ul>
 +            </div>
 +        </footer>
 +        <footer class="copyright">
 +            <a class="copyright" href=
 +            "https://creativecommons.org/licenses/by-nc-sa/4.0/" target=
 +            "_blank"><img alt="CC by-nc-sa" src="static/img/by-nc-sa.svg"></a>
 +            <p>&copy; Copyright 2002-2016, freenode</p>
 +        </footer>
 +    </div>
  </body>
- </html>
+ </html>
diff --combined templates/index.html
index 0000000000000000000000000000000000000000,3e09360a989fb62d4299fc766f7958cd11d3a786..f131bcbb02a2b83540421c28e9db5f2661571ff7
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,25 +1,20 @@@
 -    <h2 class="child">Welcome to freenode, the new home of your projects.</h2>
 -
 -
+ {% extends "base.html" %}
+ {% set title = config.name %}
+ {% block content %}
+ <div class="jumbotron">
 -        <a class="box" href="about">
 -            <i class="fa fa-comment fa-4x"></i><br>Chat
 -        </a>
 -        <a class="box" href="help">
 -            <i class="fa fa-question fa-4x"></i><br>FAQ
 -        </a>
 -        <a class="box" href="contribute">
 -            <i class="fa fa-users fa-4x"></i><br>Register a group
 -        </a>
++    <h2 class="child">Welcome to freenode, the new home of your
++    projects.</h2>
+     <div class="box-container">
 -
 -
++        <a class="box" href="about"><i class=
++        "fa fa-comment fa-4x"></i><br>
++        Chat</a> <a class="box" href="help"><i class=
++        "fa fa-question fa-4x"></i><br>
++        FAQ</a> <a class="box" href="contribute"><i class=
++        "fa fa-users fa-4x"></i><br>
++        Register a group</a>
+     </div>
+ </div>
+ <div class="main">
+     {{ get_module("news").articles[-1].render() }}
+ </div>
+ {% endblock content %}