Site tweaks

zskumar · Sep 17, 2012 · bcbdd41 · bcbdd41
1 parent ff78d7e
commit bcbdd41
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 16 deletions.
diff --git a/api/resources/csses/ace_api.css b/api/resources/csses/ace_api.css
@@ -147,6 +147,11 @@ form.navbar-search {
 
 form.navbar-search  .search-query {
     background-color: #FFFFFF;
+    border: none;
+}
+
+.navbar-search .search-query:focus, .navbar-search .search-query.focused {
+    padding: 4px 9px;
 }
 
 h3.api_title {
@@ -281,9 +286,14 @@ ul.menu {
 .srolled .membersContent {
     /*top : 0;*/
     width: 625px;
-    padding-left: 330px;
+    padding-left: 327px;
     margin : 0 auto 0 auto;
 }
+
+.srolled ul.nav {
+    padding-right: 10px;
+}
+
 .membersBackground {
 /*    background-color: white;
     position: fixed;
@@ -492,7 +502,6 @@ header.filler {
 }
 
 .centerpiece {
-    background: url(../images/sidebar_border.png) repeat-y 230px 0;
     min-height: 100%;
 }
 

diff --git a/api/resources/javascripts/disqus-ext.js b/api/resources/javascripts/disqus-ext.js
@@ -11,12 +11,10 @@ function setupDisqus() {
     var disqus_identifier = "api/" + (lochash.substr(lochash.indexOf('api=')).split('&')[0].split('=')[1] || "index") + ".html";
 
     (function() {
-        if (document.getElementById(dsqId))
-            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).removeChild(document.getElementById(dsqId));
-
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js';
-        dsq.id="disqusScript";
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        if (document.getElementById(dsqId) === null) {
+            var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+            dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
+            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);       
+        }
     })();
 }
diff --git a/doc/resources/ace/skeleton/csses/ace_api.css b/doc/resources/ace/skeleton/csses/ace_api.css
@@ -147,6 +147,11 @@ form.navbar-search {
 
 form.navbar-search  .search-query {
     background-color: #FFFFFF;
+    border: none;
+}
+
+.navbar-search .search-query:focus, .navbar-search .search-query.focused {
+    padding: 4px 9px;
 }
 
 h3.api_title {
@@ -281,9 +286,14 @@ ul.menu {
 .srolled .membersContent {
     /*top : 0;*/
     width: 625px;
-    padding-left: 330px;
+    padding-left: 327px;
     margin : 0 auto 0 auto;
 }
+
+.srolled ul.nav {
+    padding-right: 10px;
+}
+
 .membersBackground {
 /*    background-color: white;
     position: fixed;
@@ -492,7 +502,6 @@ header.filler {
 }
 
 .centerpiece {
-    background: url(../images/sidebar_border.png) repeat-y 230px 0;
     min-height: 100%;
 }
 

diff --git a/doc/site/js/main.js b/doc/site/js/main.js
@@ -39,7 +39,7 @@ $(function() {
                 $("li#dropdown_" + section.replace(/\./g, '\\.') + " a").triggerHandler('click');
             }
 
-            setupDisqus();
+            // setupDisqus();
         });
     }
 
@@ -66,6 +66,10 @@ $(function() {
         });
     });
 
+    $('a.external').click(function(e) {         
+        e.preventDefault();
+    });
+
      var tabs = $("#tabnav"),
          tab_a_selector = "a";
 
@@ -118,7 +122,8 @@ $(function() {
      $(window).on("hashchange", function(e) {
          tabs.each(function() {
             var idx = $.bbq.getState("nav") || "about";
-            $(this).find(tab_a_selector + "[href='#" + idx + "']").triggerHandler('click');
+            var section = e.fragment.split("&")[1] || "";
+            $(this).find(tab_a_selector + "[href='#" + idx + "&" + section + "']").triggerHandler('click');
 
             // handles dropping in from new link
             var api = $.bbq.getState("api");

diff --git a/doc/site/style.css b/doc/site/style.css
@@ -49,6 +49,7 @@ H3 {
 H4 {
     font-size:21px;
     color:#222222;
+    margin-bottom:8px;
 }
 
 P {

diff --git a/index.html b/index.html
@@ -90,8 +90,8 @@ <h1>Built for Code</h1>
                                 <a href="http://ace.ajax.org/build/kitchen-sink.html" target="_blank">kitchen sink</a>.</p>
                             <h2>ACE Features</h2> 
                             <ul class="content-list"> 
-                                <li><a href="http://pcwalton.blogspot.com/2010/11/syntax-highlighting-specification.html">Syntax highlighting</a> for over 40 languages (TextMate/Sublime/<em>.tmlanguage</em> files can be imported)</li>
-                                <li>Over 20 themes (TextMate/Sublime/<em>.tmtheme</em> files can be imported)</li>
+                                <li><a href="http://pcwalton.blogspot.com/2010/11/syntax-highlighting-specification.html">Syntax highlighting</a> for over 40 languages (<a href="#nav=howto&section=importing">TextMate/Sublime/<em>.tmlanguage</em> files can be imported</a>)</li>
+                                <li>Over 20 themes (<a href="#nav=howto&section=importing">TextMate/Sublime/<em>.tmtheme</em> files can be imported</a>)</li>
                                 <li>Automatic indent and outdent</li>
                                 <li>An optional command line</li>
                                 <li>Handles huge documents (at last check, 4,000,000 lines is the upper limit)</li>
@@ -344,7 +344,7 @@ <h3>Adding New Commands and Keybindings</h3>
         //...
     }
 });</code></pre>
-                        <h3>Importing Themes and Languages</h3>
+                        <h3 id ="importing">Importing Themes and Languages</h3>
       <p>ACE supports the importing of <em>.tmtheme</em> and <em>.tmlanguage</em> files for use
 in the editor. The task is accomplished by two simple node scripts.</p>
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,6 +49,7 @@ H3 { @@
     H4 {
         font-size:21px;
         color:#222222;
+        margin-bottom:8px;
     }
     P {
@@ Expand Down @@