From 1e4951dc889b78df7bc0386027029edd877df386 Mon Sep 17 00:00:00 2001
From: kaishin <reda@thoughtbot.com>
Date: Wed, 15 Feb 2012 10:37:05 -0500
Subject: [PATCH] Started restyling the sidebar

---
 sass/application.scss                  |  2 +-
 sass/discussion/_discussion.scss       | 27 -------------
 sass/discussion/_form-wmd-toolbar.scss |  2 +-
 sass/discussion/_sidebar.scss          | 55 ++++++++++++++++++++++++++
 4 files changed, 57 insertions(+), 29 deletions(-)
 create mode 100644 sass/discussion/_sidebar.scss

diff --git a/sass/application.scss b/sass/application.scss
index e26dc21221..81e2af18c9 100644
--- a/sass/application.scss
+++ b/sass/application.scss
@@ -13,4 +13,4 @@
 @import "profile";
 @import "wiki/basic-html", "wiki/sidebar", "wiki/create", "wiki/wiki";
 @import "help";
-@import "discussion/askbot-original", "discussion/discussion", "discussion/questions", "discussion/tags", "discussion/question-view" , "discussion/answers", "discussion/forms", "discussion/form-wmd-toolbar";
+@import "discussion/askbot-original", "discussion/discussion","discussion/sidebar", "discussion/questions", "discussion/tags", "discussion/question-view" , "discussion/answers", "discussion/forms", "discussion/form-wmd-toolbar";
diff --git a/sass/discussion/_discussion.scss b/sass/discussion/_discussion.scss
index 14602f897d..0a4395e27c 100644
--- a/sass/discussion/_discussion.scss
+++ b/sass/discussion/_discussion.scss
@@ -65,33 +65,6 @@ body.askbot {
           }
         }
       }
-
-      aside {
-        @extend .sidebar;
-        @include box-shadow(inset 1px 0 0 #f6f6f6);
-        @include border-radius(0 4px 4px 0);
-        border-left: 1px solid #d3d3d3;
-        border-right: 1px solid #f6f6f6;
-        padding: lh();
-        width: flex-grid(3);
-
-        h2 {
-          font-size: 16px;
-        }
-
-        h3 {
-          border-bottom: 0;
-          box-shadow: none;
-        }
-
-        input[type="text"] {
-          width: 76%;
-        }
-
-        #displayTagFilterControl {
-          margin-top: 10px;
-        }
-      }
     }
   }
 
diff --git a/sass/discussion/_form-wmd-toolbar.scss b/sass/discussion/_form-wmd-toolbar.scss
index 050f4bf354..be5bdaa24a 100644
--- a/sass/discussion/_form-wmd-toolbar.scss
+++ b/sass/discussion/_form-wmd-toolbar.scss
@@ -3,7 +3,7 @@
 }
 
 #wmd-button-bar {
-  background: url(static/images/askbot/editor-toolbar-background.png) repeat-x bottom;
+  background: url(/static/images/askbot/editor-toolbar-background.png) repeat-x bottom;
   border: 1px solid #ddd;
   height:36px;
   float:left;
diff --git a/sass/discussion/_sidebar.scss b/sass/discussion/_sidebar.scss
new file mode 100644
index 0000000000..faa30d71a0
--- /dev/null
+++ b/sass/discussion/_sidebar.scss
@@ -0,0 +1,55 @@
+div.discussion-wrapper aside {
+  @extend .sidebar;
+  @include box-shadow(inset 1px 0 0 #f6f6f6);
+  @include border-radius(0 4px 4px 0);
+  border-left: 1px solid #d3d3d3;
+  border-right: 1px solid #f6f6f6;
+  padding: lh();
+  width: flex-grid(3);
+
+  h2 {
+    font-size: 16px;
+  }
+
+  h3 {
+    border-bottom: 0;
+    box-shadow: none;
+  }
+
+  input[type="text"] {
+    width: 76%;
+  }
+
+  #displayTagFilterControl {
+    margin-top: 10px;
+  }
+
+  div.search-box {
+    input {
+      display: inline;
+    }
+    input[type='submit'] {
+      @include box-shadow(none);
+      opacity: 0.5;
+      background: url(/static/images/askbot/search-icon.png) no-repeat center;
+      border: 0;
+      margin-left: 3px;
+      position: absolute;
+      text-indent: -9999px;
+      width: 24px;
+
+      &:hover {
+        opacity: 0.9;
+      }
+
+      &:focus {
+        opacity: 1;
+      }
+    }
+
+    input#keywords {
+      padding-left: 30px;
+    }
+  }
+}
+