Fixup css styling for pages, editor, history

lib/gollum/frontend/public/gollum/css/editor.css

@@ -30,6 +30,7 @@ a {
   -webkit-border-radius: 1em;
 }
 
+.ff #gollum-editor,
 .ie #gollum-editor {
   padding-bottom: 1em;
 }
@@ -51,9 +52,9 @@ a {
   background: #fff;
   border: 1px solid #ddd;
   color: #000;
-  font-size: 1.3em;
+  font-size: 1.1em;
   font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  line-height: 1.8em;
+  line-height: 1.5em;
   margin: 1em 0 0.4em;
   padding: 0.5em;
   width: 98%;
@@ -192,44 +193,36 @@ a#function-help:hover span { background-position: -405px -28px; }
 
 #gollum-editor #gollum-editor-function-bar #gollum-editor-format-selector {
   overflow: hidden;
-  padding: 0 0 1.1em 0;
+  padding: .2em 0 .5em 0;
 }
 
 #gollum-editor #gollum-editor-function-bar
   #gollum-editor-format-selector select {
   background-color: #f9f9f9;
-  border: 1px solid transparent;
+  border: 1px solid #ddd;
+  color: #333;
 
   float: right;
-  font-size: 1.1em;
+  font-size: 1em;
   font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
   font-weight: bold;
   line-height: 1.6em;
-  padding: 0.5em 0.7em;
+  padding: 0.3em 0.4em;
-  margin-bottom: 0;
 
 
   border-radius: 0.5em;
   -moz-border-radius: 0.5em;
   -webkit-border-radius: 0.5em;
-  -moz-outline: none;
-}
-
-#gollum-editor #gollum-editor-function-bar
-  #gollum-editor-format-selector select:hover {
-  background-color: #fff;
-  border: 1px solid #ddd;
-  -moz-outline: none;
 }
 
 #gollum-editor #gollum-editor-function-bar
   #gollum-editor-format-selector label {
   color: #999;
   float: right;
-  font-size: 1.1em;
+  font-size: 1em;
   font-weight: bold;
   line-height: 1.6em;
-  padding: 0.6em 0.5em 0 0;
+  padding: .3em 0.5em 0 0;
 }
 
 #gollum-editor #gollum-editor-function-bar
@@ -243,9 +236,9 @@ a#function-help:hover span { background-position: -405px -28px; }
 #gollum-editor textarea#gollum-editor-body {
   background: #fff;
   border: 1px solid #ddd;
-  font-size: 1.3em;
+  font-size: 1em;
   font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  line-height: 1.8em;
+  line-height: 1.4em;
   margin: 1em 0 0.4em;
   padding: 0.5em; /* I don't really like mixing pct & em here… */
   width: 98%;
@@ -259,7 +252,7 @@ a#function-help:hover span { background-position: -405px -28px; }
   cursor: pointer;
   display: block;
   float: left;
-  font-size: 1.2em;
+  font-size: 1em;
   font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
   font-weight: bold;
   margin: 0;
@@ -403,7 +396,7 @@ a#function-help:hover span { background-position: -405px -28px; }
   color: #333;
   cursor: pointer;
   display: block;
-  font-size: 1.2em;
+  font-size: 1em;
   font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
   font-weight: bold;
   line-height: 1.2em;

lib/gollum/frontend/public/gollum/css/gollum.css

@@ -142,6 +142,7 @@ a:hover, a:visited {
     }
 
   /* @section footer */
+
   #wiki-footer {
     clear: both;
     margin: 2em 0 5em;
@@ -236,12 +237,12 @@ a:hover, a:visited {
   }
 
 #wiki-history {
-  margin-top: 3em;
+  margin-top: 2em;
 }
 
   #wiki-history fieldset {
     border: 0;
-    margin: 2em 0;
+    margin: 1em 0;
     padding: 0;
   }
 
@@ -263,14 +264,14 @@ a:hover, a:visited {
 
   #wiki-history table tr td {
     border: 1px solid #c0dce9;
-    font-size: 1.2em;
+    font-size: 1em;
     line-height: 1.6em;
     margin: 0;
     padding: 0.3em 0.7em;
   }
 
   #wiki-history table tr td.checkbox {
-    min-width: 2em;
+    width: 4em;
     padding: 0.3em;
   }
 
@@ -279,7 +280,9 @@ a:hover, a:visited {
     display: block;
     padding-right: 0;
     padding-top: 0.4em;
-    margin-right: -0.2em;
+    margin: 0 auto;
+    width: 1.2em;
+    height: 1.2em;
   }
 
   #wiki-history table tr:nth-child(2n),
@@ -332,6 +335,10 @@ a:hover, a:visited {
     padding: 0 0.2em;
   }
 
+.history #footer {
+  margin-bottom: 7em;
+}
+
 .history #wiki-history ul.actions li,
 .history #footer ul.actions li {
   margin: 0 0.6em 0 0;

lib/gollum/frontend/public/gollum/css/template.css

@@ -10,7 +10,7 @@
 
 
 html, body {
-  color: black;
+  color: #333;
 }
 
 body {
@@ -24,7 +24,7 @@ img {
 
 #template {
   font-size: 14px;
-  line-height: 1.4;
+  line-height: 1.6;
   margin-bottom: 40px;
 }
 
@@ -35,7 +35,7 @@ a.absent {
 
 /* Primary Body Copy */
 #template p {
-  margin: 1em 0;
+  margin: 1.4em 0;
   padding: 0;
 }
 
@@ -52,17 +52,17 @@ a.absent {
 }
 
 #template h1 {
-  border-bottom: 1px solid #ccc;
+  font-size: 28px;
-  font-size: 33px; /* was 32, GH is 33px */
   line-height: normal;
-  padding: .08em 0 0 0;
+  padding: 10px 0 0 0;
-  margin: 0;
+  margin: 30px 0 10px;
 }
 
 #template h2 {
+  border-bottom: 1px solid #ddd;
   font-size: 22px;
-  line-height: normal;
+  line-height: 1.6;
-  margin: 22px 0 0;
+  margin: 22px 0 10px;
   padding: 7px 0 0;
 }
 
@@ -110,16 +110,16 @@ a.absent {
   /* Border Reset for headers with horizontal rules */
   #template > h2:first-child,
   #template > h1:first-child {
-    margin: 12px 0 0;
+    margin: 12px 0 10px;
-    padding: 10px 0 0;
+    padding: 10px 0 10px;
   }
 
 
 /* Lists, Blockquotes & Such */
 #template ul,
 #template ol {
-  margin-top: 1.5em;
+  margin: 15px 0;
-  margin-left: 2.6em;
+  padding-left: 30px;
 }
 
   /* Nested Lists */
@@ -132,7 +132,7 @@ a.absent {
   #template ul ul,
   #template ol ol {
     padding: 0;
-    margin: .5em 0;
+    margin: 15px 0;
   }
 
 #template dl {
@@ -286,7 +286,7 @@ a.absent {
   background-color: #f8f8f8;
   border: 1px solid #dedede;
   font-size: 13px;
-  padding: 0;
+  padding: 1px 5px;
 
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
@@ -313,6 +313,7 @@ pre, code {
 #template pre code, #template pre tt {
   background-color: transparent;
   border: none;
+  padding: 0;
 }
 
 /*