]> jfr.im git - irc/freenode/web-7.0.git/commitdiff
projects / irc / freenode / web-7.0.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side (parent: 83bbe10)
Moving around
authorSvante Bengtson <redacted>
Sun, 21 Feb 2016 23:47:27 +0000 (00:47 +0100)
committerSvante Bengtson <redacted>
Sun, 21 Feb 2016 23:47:27 +0000 (00:47 +0100)
css/mock1.css patch | blob | blame | history
index_mock1.html patch | blob | blame | history

diff --git a/css/mock1.css b/css/mock1.css
index 6c97c5d454ec9c6ac86090ba9d87542d06e50a58..172ac2f0db00dbd02f8856234f96d299ef7376d9 100644 (file)
--- a/css/mock1.css
+++ b/css/mock1.css
@@ -21,6 +21,17 @@ a {
   text-decoration: none;
 }
 
+/* order */
+.jumbotron {
+  order: 0;
+}
+.navkinks {
+  order:1;
+}
+.main {
+  order: 2;
+}
+
 /* navbar */
 .navbar {
   width: 100%;
@@ -40,6 +51,11 @@ a {
 .nlogo {
   height: 40px;
 }
+.navlinks {
+  display: flex;
+  justify-content: space-around;
+  fkex-wrap: nowrap;
+}
 .nlink {
   text-decoration: none;
   color: var(--nlink-col);
@@ -55,13 +71,17 @@ a {
   width: 100%; 
   margin-left: 0;
   margin-right: 0;
-  position: static;
+  display: flex;
+  flex-direction: column;
+  fkex-wrap: wrap;
+  justify-content: space-between;
 }
 
 /* jumbotron */
 .jumbotron {
   background: var(--jumbotron-bg);
   width: 100%;
+  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);
diff --git a/index_mock1.html b/index_mock1.html
index c6cdbdef473779ebfe5a7b38a29e7ffdea3ed6e1..e2cb55d59ac22e08673768033245ca5c62e47bfc 100644 (file)
--- a/index_mock1.html
+++ b/index_mock1.html
@@ -11,10 +11,8 @@
 <body>
     <nav class="navbar">
         <a href="index"><img src="img/logos/coloured-alphabg.svg" class="nlogo" alt="freenode" /></a>
-        <a href="about" class="nlink">About</a>
-        <a href="help" class="nlink">Help</a>
-        <a href="contribute" class="nlink">Contribute</a>
-        <a href="projects" class="nlink">Projects&nbsp;</a>
+        <!--navkinks-->
+        <a href="PIA" target="_blank"><img src="img/logos/newPIA.png" alt="Private internet access" class="nlogo" /></a>
     </nav>
     <div class="container">
         <div class="jumbotron">
@@ -36,12 +34,19 @@
                     <img src="" alt="gms" height="60px" width="60px" /><br />
                     Know who's using freenode
                 </a>
-                <a href="PIA" class="box">
+                <!--<a href="PIA" class="box">
                     <img src="img/logos/newPIA.png" alt="Private internet access" height="60px" class="box-center"/><br />
-                </a>
+                </a>-->
             </div>
         </div>
         
+        <div class="navlinks">
+            <a href="about" class="nlink">About</a>
+        <a href="help" class="nlink">Help</a>
+        <a href="contribute" class="nlink">Contribute</a>
+        <a href="projects" class="nlink">Projects&nbsp;</a>
+        </div>
+        
         <div class="main">
             <h1>News</h1>
             <div class="art">
Unnamed repository; edit this file 'description' to name the repository.