From 2d3ebff218d5eaa08b2cd62324019eba9ca7015c Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Tue, 31 Jan 2012 14:45:44 -0500
Subject: [PATCH] IE6 & 7 fixeS

---
 .DS_Store              | Bin 12292 -> 12292 bytes
 marketing.html         |   3 +++
 sass/_index.scss       |   2 +-
 sass/_wiki-create.scss |  28 ++++++++++++++++++----------
 sass/marketing-ie.scss |   9 +++++++++
 simplewiki_edit.html   |   2 +-
 6 files changed, 32 insertions(+), 12 deletions(-)
 create mode 100644 sass/marketing-ie.scss

diff --git a/.DS_Store b/.DS_Store
index a630216fad2b616b683bda11c2b2e6803e0fb4f3..b9a409939207eb86dd2d0e8a5dbb4b906be0aec4 100644
GIT binary patch
delta 106
zcmZokXi3;mEWo&Sa*05)msoYRfsTSnt&T#qk*OJwX=rL}QCrK&$-yb`ghNzG&&DGp
pv8uYJwvGV|7#Sfn122?@Q4O1w1)s2OW|jECviZLZt1uG-0|0Gi7LNb`

delta 82
zcmZokXi3;mEWo&aa*05)jzo2}iII_xf}x37t&T#qg`uI2f~lotZ7nA!2d6+ghp3XC
mjYmjgO>JF$!(>K5dB&#Aih@trHnU57V_`}O-~3mGRTu!|HW&i{

diff --git a/marketing.html b/marketing.html
index a897145379..0a30783e38 100644
--- a/marketing.html
+++ b/marketing.html
@@ -5,6 +5,9 @@
 
   <!--link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" /-->
   <link rel="stylesheet" href="/static/css/marketing.css" type="text/css" media="all" />
+  <!--[if lt IE 8]>
+  <link rel="stylesheet" href="/static/css/marketing-ie.css" type="text/css" media="all" />
+  <![endif]-->
 
   <script type="text/javascript" src="${ settings.LIB_URL }jquery-1.6.2.min.js"></script>
   <script type="text/javascript" src="${ settings.LIB_URL }jquery-ui-1.8.16.custom.min.js"></script>
diff --git a/sass/_index.scss b/sass/_index.scss
index 784d9eecef..f1dd89392f 100644
--- a/sass/_index.scss
+++ b/sass/_index.scss
@@ -358,7 +358,7 @@ section.index-content {
 
         &.requirements {
           clear: both;
-          width: auto;
+          width: 100%;
           border-top: 1px solid #E5E5E5;
           padding-top: lh();
           margin-bottom: 0;
diff --git a/sass/_wiki-create.scss b/sass/_wiki-create.scss
index d37d739dcc..e4aad2d4ba 100644
--- a/sass/_wiki-create.scss
+++ b/sass/_wiki-create.scss
@@ -27,6 +27,7 @@ form#wiki_revision {
     color: #999;
     float: right;
     text-decoration: underline;
+    font-weight: normal;
   }
   
   input[type="submit"] {
@@ -37,18 +38,25 @@ form#wiki_revision {
 #wiki_edit_instructions {
   float: left;
   width: flex-grid(3, 9);
+  margin-top: lh();
+  color: #666;
+
+  &:hover {
+    color: #333;
+  }
 
   .markdown-example {
-    background-color: $light-gray;
-    padding-top: 5px;
-    padding-right: 2px;
-    padding-bottom: 5px;
-    padding-left: 5px;
-        
-    margin-top: 5px;
-    margin-bottom: 7px;
-    margin-left: 5px;
-        
+    background-color: #e3e3e3;
+    text-shadow: 0 1px 0 #fff;
+
+    padding: {
+      top: 5px;
+      right: 2px;
+      bottom: 5px;
+      left: 5px;
+    }
+
+    margin: 5px 0 7px;
     line-height: 1.0;
   }
 }
diff --git a/sass/marketing-ie.scss b/sass/marketing-ie.scss
new file mode 100644
index 0000000000..0d1562a88a
--- /dev/null
+++ b/sass/marketing-ie.scss
@@ -0,0 +1,9 @@
+body {
+  margin: 0;
+  padding: 0;
+}
+
+.wrapper, .subpage, section.copyright, section.tos, section.privacy-policy, section.honor-code, header.announcement div, section.index-content, footer {
+  margin: 0;
+  overflow: hidden;
+}
diff --git a/simplewiki_edit.html b/simplewiki_edit.html
index fc5f63d970..7ead7f4abc 100644
--- a/simplewiki_edit.html
+++ b/simplewiki_edit.html
@@ -12,7 +12,7 @@ ${ wiki_article.title }
       <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
   </div>
   ${wiki_form}
-  <input type="submit" id="submit_edit" name="edit" value="Edit article" />
+  <input type="submit" id="submit_edit" name="edit" value="Save Changes" />
   <input type="submit" id="submit_delete" name="delete" value="Delete article" />
 </form>