Merge resolution

doc/resources/ace/skeleton/csses/ace_api.css

@@ -156,6 +156,9 @@ form.navbar-search  .search-query {
 
 form.navbar-search  .search-query:focus, form.navbar-search  .search-query:active {
     border: 1px solid #666;
+}
+
+.navbar-search .search-query:focus, .navbar-search .search-query.focused {
     padding: 4px 9px;
 }
 
@@ -295,9 +298,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;
@@ -506,7 +514,6 @@ header.filler {
 }
 
 .centerpiece {
-    background: url(../images/sidebar_border.png) repeat-y 230px 0;
     min-height: 100%;
     padding: 10px 0;
 }

doc/resources/ace/skeleton/javascripts/clicker.js

@@ -61,7 +61,7 @@ function setupClicker() {
   // for the top dropdown
   $('li.memberLink a').click(transformHash);
   
-  $('a[href^="#"]').click(transformHash);
+  //$('a[href^="#"]').click(transformHash);
   
   $('.related-to', '.metaInfo').click(function(){
       location.hash = $(this).find('a').attr('href').split('#')[1];

doc/site/js/main.js

@@ -22,14 +22,14 @@ $(function() {
     // used when page is access directly
     function magicClickInterceptor(e) {
         e.preventDefault();
-          
+            
         var state = {};
         state.api = $(this).attr("href").substring(6, $(this).attr("href").length - 5);
         $.bbq.pushState(state);
         
         var _self = $(this);
         $("#apiHolder").load($(this).attr("href") + " #documentation", function(){
-            $("#apiHolder").removeClass("apiIntro").removeClass("span8");
+        $("#apiHolder").removeClass("apiIntro").removeClass("span8");
             ux();
             setupClicker();
         
@@ -46,6 +46,10 @@ $(function() {
     $('.menu-item a').click(magicClickInterceptor);
     $('a.argument').click(magicClickInterceptor);
     
+    $('a.external').click(function(e) {         
+        e.preventDefault();
+    });
+
      var tabs = $("#tabnav"),
          tab_a_selector = "a";
 
@@ -100,6 +104,7 @@ $(function() {
      $(window).on("hashchange", function(e) {
          tabs.each(function() {
             var idx = $.bbq.getState("nav") || "about";
+            var section = e.fragment.split("&")[1] || "";
             $(this).find(tab_a_selector + "[href='#" + idx + "']").triggerHandler('click');
             
             // handles dropping in from new link

doc/site/style.css

@@ -53,6 +53,7 @@ H3 {
 H4 {
     font-size:21px;
     color:#222222;
+    margin-bottom:8px;
 }
 
 P {