changeset 81:b748a89a04b0 kai

Some layout changes.
author Kai T. Ohlhus <k.ohlhus@gmail.com>
date Fri, 14 Oct 2016 03:15:33 +0200
parents 05b2f0d66aa8
children bc79072a8169
files _layouts/default.html css/octave.css
diffstat 2 files changed, 36 insertions(+), 55 deletions(-) [+]
line wrap: on
line diff
--- a/_layouts/default.html	Fri Oct 14 03:15:09 2016 +0200
+++ b/_layouts/default.html	Fri Oct 14 03:15:33 2016 +0200
@@ -5,13 +5,11 @@
 
 <body>
 
-  {% include header.html %}
+{% include header.html %}
 
-  <div class="page-content">
-    {{ content }}
-  </div>
+{{ content }}
 
-  {% include footer.html %}
+{% include footer.html %}
 
 </body>
 
--- a/css/octave.css	Fri Oct 14 03:15:09 2016 +0200
+++ b/css/octave.css	Fri Oct 14 03:15:33 2016 +0200
@@ -16,6 +16,15 @@
 
 svg.octicon-topnav {
   height: 18px;
+  fill: #ffffff;
+}
+
+img {
+  max-width: 500px;
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+  border: 1px solid #0790c0;
 }
 
 div.alert {
@@ -24,16 +33,19 @@
 }
 
 div#logo {
-  color: #0790c0;
   margin: 10px;
 }
 
 div#logo img {
   height: 70px;
-  vertical-align:middle;
+  width: 70px;
+  border: 0;
+  vertical-align: middle;
+  display: inline;
 }
 
 div#logo span {
+  color: #0790c0;
   font-weight: bold;
   font-size: 25pt;
 }
@@ -42,10 +54,14 @@
   font-family: arial,sans-serif;
   font-weight: normal;
   font-size: medium;
-  background: white;
-  color: black;
-  margin: 0;
-  padding: 0px;
+  text-align: justify;
+  background: #ffffff;
+  color: #000000;
+  margin: 0 auto;
+  margin-left: 10%;
+  margin-right: 10%;
+  padding: 0;
+  width: auto;
 }
 
 a, a:link {
@@ -59,20 +75,7 @@
 
 div.news-content {
   margin-left:1em;
-}
-
-div.page-content {
-  width: 540px;
-  margin: 0 auto;
-  text-align: justify;
-}
-
-div.page-content img {
-  max-width:100%;
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-  border: 1px solid #0790c0;
+  text-align: left;
 }
 
 footer {
@@ -80,6 +83,7 @@
   font-size: x-small;
   text-align: center;
   border-top: 1px solid;
+  padding: 5px;
   margin: 5px;
   margin-top: 20px;
 }
@@ -136,22 +140,13 @@
   display: none;
 }
 
-ul.topnav li#logo a {
-  font-size: 30px;
-  font-weight: bold;
-}
-
-ul.topnav li svg {
-  fill: white;
-}
-
-@media screen and (max-width:700px) {
-  ul.topnav li:not(:first-child) {display: none;}
+@media screen and (max-width:650px) {
+  ul.topnav li:not(:first-child) {
+    display: none;
+  }
   ul.topnav li.icon {
     float: right;
     display: inline-block;
-    margin-left: 15px;
-    margin-right: 15px;
   }
   ul.topnav.responsive {
     position: relative;
@@ -169,24 +164,12 @@
     display: block;
     text-align: left;
   }
-  div.page-content {
-    width: auto;
-    margin: 15px;
-  }
-  div.page-content img {
-    width: 500px;
+  body {
+    margin-left: 15px;
+    margin-right: 15px;
   }
-}
-
-@media screen and (min-width:1000px) {
-  div.page-content {
-    width: auto;
-    margin-left: 10%;
-    margin-right: 10%;
-  }
-
-  div.page-content img {
-    width: 500px;
+  img {
+    max-width: 100%;
   }
 }