summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArun Persaud <arun@nubati.net>2011-10-07 18:29:23 -0700
committerArun Persaud <apersaud@lbl.gov>2011-10-07 18:29:23 -0700
commita76008b94138f041b5a8f2426a55d59142152d02 (patch)
treecf38f71a42d879ea96f1cab3189b08d222b4c0b2
parent537df4aa5637c6ed6625b11b5be3ad3ae7c2262c (diff)
downloade-DoKo-a76008b94138f041b5a8f2426a55d59142152d02.tar.gz
e-DoKo-a76008b94138f041b5a8f2426a55d59142152d02.tar.bz2
e-DoKo-a76008b94138f041b5a8f2426a55d59142152d02.zip
fixed some css issues after changing to normalize.css
-rw-r--r--css/standard.css7
-rw-r--r--include/output.php2
2 files changed, 4 insertions, 5 deletions
diff --git a/css/standard.css b/css/standard.css
index 21691bf..3606812 100644
--- a/css/standard.css
+++ b/css/standard.css
@@ -25,8 +25,7 @@ header {
text-align: center;
height: 4em;
padding-top: 1.5em;
- margin-left: 3em;
- margin-right: 3em;
+ margin: 0em 3em;
border-bottom: 3px solid gray;
}
@@ -39,8 +38,8 @@ header {
.main {
background-color: #fff;
- margin-left: 3em;
- margin-right: 3em;
+ margin: 0em 3em;
+ padding: 1em 0em;
min-height: 40em;
}
diff --git a/include/output.php b/include/output.php
index 429d095..bbdc99f 100644
--- 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" />
- <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>