From bcbdd41751a07094c99756b3a075fb9b12319c55 Mon Sep 17 00:00:00 2001 From: Garen Torikian Date: Mon, 17 Sep 2012 11:27:46 -0700 Subject: [PATCH] Site tweaks --- api/resources/csses/ace_api.css | 13 +++++++++++-- api/resources/javascripts/disqus-ext.js | 12 +++++------- doc/resources/ace/skeleton/csses/ace_api.css | 13 +++++++++++-- doc/site/js/main.js | 9 +++++++-- doc/site/style.css | 1 + index.html | 6 +++--- 6 files changed, 38 insertions(+), 16 deletions(-) diff --git a/api/resources/csses/ace_api.css b/api/resources/csses/ace_api.css index f849dcf7..1a974a02 100644 --- 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 index 66da8bfc..67212a3f 100644 --- 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); + } })(); } \ No newline at end of file diff --git a/doc/resources/ace/skeleton/csses/ace_api.css b/doc/resources/ace/skeleton/csses/ace_api.css index f849dcf7..1a974a02 100644 --- 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 index e4f78ffc..e206f413 100644 --- 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 index 40118ed5..5bb9a900 100644 --- 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 index 90dceff1..6406d8bb 100644 --- a/index.html +++ b/index.html @@ -90,8 +90,8 @@ console.log(addResult); kitchen sink.

ACE Features