From 6cc398ae2609d1f590ec0ee35f3367cd3024dfb4 Mon Sep 17 00:00:00 2001
From: Eston Bond <Eston Bond>
Date: Sat, 4 Dec 2010 16:07:30 -0800
Subject: [PATCH] IE7/8: Align buttons, fix compare overflow issue WebKit:
 Restyle search query box

---
 lib/gollum/frontend/public/css/gollum.css     | 46 +++++++++++++++++--
 lib/gollum/frontend/public/css/ie7.css        | 12 ++++-
 .../frontend/templates/compare.mustache       |  4 +-
 3 files changed, 54 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 lib/gollum/frontend/templates/compare.mustache

diff --git a/lib/gollum/frontend/public/css/gollum.css b/lib/gollum/frontend/public/css/gollum.css
index 55eb4523..fc33f23b 100755
--- a/lib/gollum/frontend/public/css/gollum.css
+++ b/lib/gollum/frontend/public/css/gollum.css
@@ -421,6 +421,7 @@ a:hover, a:visited {
   .compare .data {
     border: 1px solid #ddd;
     margin-top: 1em;
+    overflow: auto;
   }
   
   .compare .data pre {
@@ -493,7 +494,27 @@ ul.actions {
    margin-left: 0.6em;
  }
 
-.minibutton a,
+.minibutton a {
+  background-color: #f7f7f7;
+  border: 1px solid #d4d4d4;
+  color: #333;
+  display: block;
+  font-weight: bold;
+  margin: 0;
+  padding: 0.4em 1em;
+  height: 1.4em;
+
+  text-shadow: 0 1px 0 #fff;
+
+  filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#f4f4f4', endColorstr='#ececec');
+  background: -webkit-gradient(linear, left top, left bottom, from(#f4f4f4), to(#ececec));
+  background: -moz-linear-gradient(top, #f4f4f4, #ececec);
+
+  border-radius: 3px;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+}
+
 #search-submit {
   background-color: #f7f7f7;
   border: 1px solid #d4d4d4;
@@ -590,12 +611,22 @@ ul.actions {
   }
 
   #head #searchbar #searchbar-fauxtext input#search-query {
-    border: 0;
+    border: none;
     color: #000;
+    float: left;
     font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
     font-size: 1.2em;
-    line-height: 1.6em;
-    padding: 0.4em 0.6em;
+    height: 1.8em;
+    
+    -webkit-focus-ring: none;
+  }
+
+  .ff #head #searchbar #searchbar-fauxtext input#search-query {
+    padding: 0.2em 0 0.2em 0.5em;
+  }
+  
+  .ie #head #searchbar #searchbar-fauxtext input#search-query {
+    padding: 0.4em 0 0 0.5em;
   }
   
   #head #searchbar #searchbar-fauxtext input#search-query.ph {
@@ -621,12 +652,17 @@ ul.actions {
     background-position: -431px -1px;
     background-repeat: no-repeat;
     display: block;
-    height: 25px;
+    height: 2em;
     overflow: hidden;
     text-indent: -5000px;
     width: 28px;
   }
   
+  .ff #head #searchbar #searchbar-fauxtext #search-submit span,
+  .ie #head #searchbar #searchbar-fauxtext #search-submit span {
+    height: 2.2em;
+  }
+  
   #head #searchbar #searchbar-fauxtext #search-submit:hover span {
     background-position: -431px -28px;
     padding: 0;
diff --git a/lib/gollum/frontend/public/css/ie7.css b/lib/gollum/frontend/public/css/ie7.css
index 71b938b5..551edb20 100755
--- a/lib/gollum/frontend/public/css/ie7.css
+++ b/lib/gollum/frontend/public/css/ie7.css
@@ -1,7 +1,13 @@
 /* IE7-specific styles */
 
-#head #searchbar #searchbar-fauxtext input#search-query {
+.ie #head #searchbar #searchbar-fauxtext input#search-query {
+  border: 0;
   float: left;
+  padding: 0.4em 0 0 0.5em;
+}
+
+.ie #head #searchbar #searchbar-fauxtext #search-submit span {
+  height: 2.25em;
 }
 
 #head #searchbar,
@@ -17,6 +23,10 @@ ul.actions {
   margin-top: 1em;
 }
 
+.compare div.data {
+  overflow: auto;
+}
+
 .history #version-form {
   margin: -0.5em 0 -0.5em !important;
 }
diff --git a/lib/gollum/frontend/templates/compare.mustache b/lib/gollum/frontend/templates/compare.mustache
old mode 100644
new mode 100755
index 6f046459..0325d018
--- a/lib/gollum/frontend/templates/compare.mustache
+++ b/lib/gollum/frontend/templates/compare.mustache
@@ -9,12 +9,12 @@
 </div>
 <div id="compare-content">
   <div class="data highlight">
-    <table cellpadding="0" cellspacing="0" width="100%">
+    <table cellpadding="0" cellspacing="0">
       {{#lines}}
         <tr>
           <td class="line_numbers">{{ldln}}</td>
           <td class="line_numbers">{{rdln}}</td>
-          <td width="100%">
+          <td>
             <pre><div class="{{class}}">{{line}}</div></pre>
           </td>
         </tr>