diff --git a/website/extra/htaccess b/website/extra/htaccess index a4c3f83de7..fd34633f4d 100644 --- a/website/extra/htaccess +++ b/website/extra/htaccess @@ -1,15 +1,17 @@ -RewriteRule ^/features/all$ /features/index.html [L] -RewriteRule ^/features/experimental/all$ /features/experimental/index.html [L] -RewriteRule ^/features/.*\.html$ - [L] -RewriteRule ^/features/(.*)$ /features/$1.html [L] -RewriteRule ^/features$ /features/index.html [L] -RewriteRule ^/features/experimental$ /features/experimental/index.html [L] -RewriteRule ^/changelog$ /changelog.html [L] -RewriteRule ^/?$ /main.html [L] -RewriteRule ^/index(.html)?$ /main.html [L] -RewriteRule ^/credits$ /credits.html [L] -RewriteRule ^/download$ /download.html [L] -RewriteRule ^/all(-v|V)ersions(.html)?$ /all-versions.html [L] -RewriteRule ^/setup/.*\.html$ - [L] -RewriteRule ^/setup/(.*) /setup/$1.html [L] - +RewriteEngine On +RewriteRule ^features/all$ /features/index.html [L,END] +RewriteRule ^features/index(\.html)?$ /features/index.html [L,END] +RewriteRule ^features/experimental/all$ /features/experimental/index.html [L,END] +RewriteRule ^features/experimental/index(\.html)?$ /features/experimental/index.html [L,END] +RewriteRule ^features/.*\.html$ - [L,END] +RewriteRule ^features/(.*)$ /features/$1.html [L,END] +RewriteRule ^features$ /features/index.html [L,END] +RewriteRule ^features/experimental$ /features/experimental/index.html [L,END] +RewriteRule ^changelog$ /changelog.html [L,END] +RewriteRule ^$ /main.html [L,END] +RewriteRule ^index(\.html)?$ /main.html [L,END] +RewriteRule ^credits$ /credits.html [L,END] +RewriteRule ^download$ /download.html [L,END] +RewriteRule ^all-versions$ /all-versions.html [L,END] +RewriteRule ^setup/.*\.html$ - [L,END] +RewriteRule ^setup/(.*) /setup/$1.html [L,END] diff --git a/website/resources/css/custom.css b/website/resources/css/custom.css index d3022e2852..6a1c564d18 100644 --- a/website/resources/css/custom.css +++ b/website/resources/css/custom.css @@ -5,6 +5,7 @@ html { body { margin-bottom: 60px; + overflow-y: scroll; } ul.dropdown-menu .header { @@ -24,12 +25,6 @@ div.snippet code { z-index: 2000; } -@media (max-width: 768px) { - .fork-me { - display: none; - } -} - .video { padding-top: 4%; } @@ -150,3 +145,32 @@ a { .changelog li { text-align: left; } + +@media (max-width: 768px) { + .fork-me { + display: none; + } + + h1 { + font-size: 20px; + } + + h2 { + font-size: 18px; + } + + h3 { + font-size: 16px; + } + + .main-section { + padding-left: 30px; + padding-right: 30px; + } + + video { + width: 100%; + height: auto; + } +} + diff --git a/website/resources/js/main.js b/website/resources/js/main.js index 146dd5540f..ebeeab9dfa 100644 --- a/website/resources/js/main.js +++ b/website/resources/js/main.js @@ -2,13 +2,13 @@ (function($) { swfobject.registerObject("player", "9.0.98", "videos/expressInstall.swf"); - + function toKey(href) { var lnk = "__savedContent_" + href.replace(/\//g, '_'); if (lnk.substring(lnk.length - 5) === ".html") lnk = lnk.substring(0, lnk.length - 5); return lnk; } - + function captureLinkClick() { var self = $(this); if (self.data("clc")) return; @@ -25,13 +25,17 @@ History.pushState({urlPath: href}, self.text(), href); }); } - + + function collapseMenu() { + if ($(".navbar-collapse").is(".in")) $(".navbar-toggle").click() + } + function ajaxFeaturePages() { if (!History.enabled) return; History.replaceState({urlPath: window.location.pathname}, $("title").text(), History.getState().urlpath); - + $("a").each(captureLinkClick); - + $(window).on("statechange", function() { var hs = History.getState(); var u = hs.data.urlPath; @@ -44,6 +48,7 @@ var a = $("#main-section"); sc.show().attr("id", "main-section").attr("class", "container-fluid main-section"); a.replaceWith(sc); + collapseMenu(); } else { $.ajax({ url: u, @@ -54,12 +59,13 @@ var end = response.indexOf(y); var newH = $(response.substr(start, end - start)); $("#main-section").replaceWith(newH); + collapseMenu(); $("a").each(captureLinkClick); } }); } }); } - + $(ajaxFeaturePages); })($); diff --git a/website/templates/_scaffold.html b/website/templates/_scaffold.html index f20a839d79..8d639b695f 100644 --- a/website/templates/_scaffold.html +++ b/website/templates/_scaffold.html @@ -13,14 +13,6 @@

${title}

- Project Lombok @@ -49,12 +41,14 @@

${title}

- - Fork me on GitHub - - +
diff --git a/website/templates/all-versions.html b/website/templates/all-versions.html index 975921606d..e43196650d 100644 --- a/website/templates/all-versions.html +++ b/website/templates/all-versions.html @@ -6,7 +6,7 @@

- + ${version} [Current Version]
diff --git a/website/templates/main.html b/website/templates/main.html index 18f7230bb8..b836a3c926 100644 --- a/website/templates/main.html +++ b/website/templates/main.html @@ -5,12 +5,12 @@

Lombok Demo

-