fixed some css issues after changing to normalize.css

diff --git a/css/standard.css b/css/standard.css
index 21691bfefeff9ed7199f94baa0ea1ac513726a41..36068120714f301b23404cd11fff415a2454b5e1 100644 (file)
--- a/css/standard.css
+++ b/css/standard.css
@@ -25,8 +25,7 @@ header {
   text-align:       center;
   height:           4em;
   padding-top: 1.5em;
   text-align:       center;
   height:           4em;
   padding-top: 1.5em;

-  margin-left: 3em;
-  margin-right: 3em;
+  margin: 0em 3em;

   border-bottom:    3px solid gray;
 }
 
   border-bottom:    3px solid gray;
 }
 


@@ -39,8 +38,8 @@ header {
 
 .main {
   background-color: #fff;
 
 .main {
   background-color: #fff;

-  margin-left: 3em;
-  margin-right: 3em;
+  margin: 0em 3em;
+  padding: 1em 0em;

   min-height: 40em;
 }
 
   min-height: 40em;
 }
 

diff --git a/include/output.php b/include/output.php
index 429d095453baf2047b0f0b80d1728f94fe08c78f..bbdc99f1e0d09b7f3b809e37a0f3a9559adceea1 100644 (file)
--- a/include/output.php
+++ b/include/output.php
@@ -378,7 +378,7 @@ function output_header()
      <meta charset="utf-8" />
      <link rel="shortcut icon" href="pics/edoko-favicon.png" />
      <link rel="stylesheet" href="css/normalize.css?v=1" />
      <meta charset="utf-8" />
      <link rel="shortcut icon" href="pics/edoko-favicon.png" />
      <link rel="stylesheet" href="css/normalize.css?v=1" />

-     <link rel="stylesheet" href="css/standard.css?v=31" />
+     <link rel="stylesheet" href="css/standard.css?v=32" />

      <link rel="stylesheet" media="screen and (max-width: 600px)" href="css/narrow.css?v=1" />
      <link rel="stylesheet" href="css/dateinput.css?v=1"/>
      <script type="text/javascript" src="include/jquery.js"> </script>
      <link rel="stylesheet" media="screen and (max-width: 600px)" href="css/narrow.css?v=1" />
      <link rel="stylesheet" href="css/dateinput.css?v=1"/>
      <script type="text/javascript" src="include/jquery.js"> </script>