From 6d7f6de6df6264d123611309738a53080d19f4e6 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 10 Jan 2013 15:58:49 +0400
Subject: [PATCH] fix site

---
 doc/site/style.css        | 15 ++++-----------
 index.html                | 13 +++++++------
 lib/ace/ext/searchbox.css |  9 ++++-----
 lib/ace/ext/searchbox.js  |  4 ++--
 4 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/doc/site/style.css b/doc/site/style.css
index 79640676..5e16c723 100644
--- a/doc/site/style.css
+++ b/doc/site/style.css
@@ -5,25 +5,18 @@ body {
     font-family: Helvetica, Arial;
 }
 
-#embed_ace_wrapper {
-    height: 525px;
-}
 
-.ace_editor_wrapper {
+
+#ace_editor_demo, #embedded_ace_code {
     height: 275px;
-    position: relative;
     border: 1px solid #DDD;
     border-radius: 4px;
     border-bottom-right-radius: 0px;
     margin-top: 5px;
 }
 
-#ace_editor_demo, #embedded_ace_code {
-    left: 0px;
-    top: 0px;
-    bottom: 1px;
-    right: 1px;
-    background: #fff;
+#embedded_ace_code {
+    height: 525px;
 }
 
 h1, h2, h3, h4, h5, h6 {
diff --git a/index.html b/index.html
index 4f8bef91..448dbcdb 100644
--- a/index.html
+++ b/index.html
@@ -6,7 +6,10 @@
         <script src="./doc/resources/ace/skeleton/javascripts/jquery.js"></script>
         <script src="./doc/resources/ace/skeleton/javascripts/bbq.js"></script>
         <script src="./api/resources/javascripts/bootstrap.js"></script>
-        <script src="https://d1n0x3qji82z53.cloudfront.net/src-min-noconflict/ace.js"></script>
+        <script src="./build/src/ace.js"></script>
+        <script>
+            ace = require("ace/ace")
+        </script>
         <script src="https://yandex.st/highlightjs/7.2/highlight.min.js"></script>
         <script src="doc/site/js/main.js"></script>
         <link rel="stylesheet" href="https://yandex.st/highlightjs/7.0/styles/default.min.css">
@@ -69,7 +72,7 @@
                                 in any web page and JavaScript application. ACE is maintained as the
                                 primary editor for <a href="http://c9.io">Cloud9 IDE</a>
                                 and is the successor of the Mozilla Skywriter (Bespin) project.</p> 
-                            <div class="ace_editor_wrapper">
+                            
                                 <div id="ace_editor_demo">/**
  * In fact, you're looking at ACE right now. Go ahead and play with it!
  *
@@ -85,7 +88,6 @@ function add(x, y) {
 
 var addResult = add(3, 2);
 console.log(addResult);</div>
-                            </div>
                             <p id="embed_link"><a href="#nav=embedding">Learn how to embed this in your own site</a></p>
                             <p class="highlight_note">Looking for a more full-featured demo? Check out the
                                 <a href="http://ace.ajax.org/build/kitchen-sink.html" target="_blank">kitchen sink</a>.</p>
@@ -142,8 +144,7 @@ console.log(addResult);</div>
                             <h1>Embedding ACE in Your Site</h1>
                             <p>ACE can be easily embedded into a web page. Just copy the code below:</p>
 
-                            <div id="embed_ace_wrapper" class="ace_editor_wrapper">
-                                <div id="embedded_ace_code">&lt;!DOCTYPE html>
+                            <div id="embedded_ace_code">&lt;!DOCTYPE html>
 &lt;html lang="en">
 &lt;head>
 &lt;title>ACE in Action&lt;/title>
@@ -171,7 +172,7 @@ console.log(addResult);</div>
     editor.getSession().setMode("ace/mode/javascript");
 &lt;/script>
 &lt;/body>
-&lt;/html></div></div>
+&lt;/html></div>
                             <p>Now check out the <a href="#nav=howto">How-To Guide</a> for instructions on
                                 common operations, such as setting a different language mode or
                                 getting the contents from the editor.</p>
diff --git a/lib/ace/ext/searchbox.css b/lib/ace/ext/searchbox.css
index 2b828c8d..c8fd126a 100644
--- a/lib/ace/ext/searchbox.css
+++ b/lib/ace/ext/searchbox.css
@@ -9,6 +9,7 @@
     border-top: 0 none;
     max-width: 297px;
     overflow: hidden;
+    margin: 0;
     padding: 4px;
     padding-right: 6px;
     padding-bottom: 0;
@@ -34,11 +35,8 @@
     margin-bottom: 4px;
     overflow: hidden;
 }
-.ace_search label {
-    float: left;
-    color: #656565;
-}
-.ace_search input {
+
+.ace_search_field {
     background-color: white;
     border-right: 1px solid #cbcbcb;
     border: 0 none;
@@ -51,6 +49,7 @@
     outline: 0;
     padding: 0 7px;
     width: 214px;
+    margin: 0;
 }
 .ace_searchbtn,
 .ace_replacebtn {
diff --git a/lib/ace/ext/searchbox.js b/lib/ace/ext/searchbox.js
index 9f62411b..eecac88c 100644
--- a/lib/ace/ext/searchbox.js
+++ b/lib/ace/ext/searchbox.js
@@ -43,12 +43,12 @@ dom.importCssString(searchboxCss, "ace_searchbox");
 var html = '<div class="ace_search right">\
     <button action="hide" class="ace_searchbtn_close"></button>\
     <div class="ace_search_form">\
-        <input type="text" class="ace_search_field" placeholder="Search for" spellcheck="false">\
+        <input class="ace_search_field" placeholder="Search for" spellcheck="false">\
         <button action="findNext" class="ace_searchbtn next"></button>\
         <button action="findPrev" class="ace_searchbtn prev"></button>\
     </div>\
     <div class="ace_replace_form">\
-        <input type="text" class="ace_search_field" placeholder="Replace with" spellcheck="false">\
+        <input class="ace_search_field" placeholder="Replace with" spellcheck="false">\
         <button action="replace" class="ace_replacebtn">Replace</button>\
         <button action="replaceAll" class="ace_replacebtn">All</button>\
     </div>\