12 files changed, 124 insertions, 22 deletions
diff --git a/website/resources/css/custom.css b/website/resources/css/custom.css
index 6774a7d5..bd838df5 100644
--- a/website/resources/css/custom.css
+++ b/website/resources/css/custom.css
@@ -1,39 +1,94 @@
 .importantNotification {
-        background-color: #FFEBCD;
-        border-radius: 20px;
-        padding: 10px;
-        margin: 10px;
+	background-color: #FFEBCD;
+	border-radius: 20px;
+	padding: 10px;
+	margin: 10px;
 }
 
-#clickForVideo {
-	padding: 20px 30px;
-	background-color: #DDD;
-	cursor: pointer;
-	margin-left: auto;
-	margin-right: auto;
-	margin-bottom: 40px;
+.tidelift-link-inline {
+	border-radius: 18px;
+	background-color: #626980;
+	background-color: #626980;
+	background-image: url('/img/tidelift-mark.png');
+	background-repeat: no-repeat;
+	background-position: 6px;
+	background-size: 12px;
+	padding: 2px 8px 2px 26px;
+	color: white;
 }
 
-.tidelift-para {
-	margin-top: 10px;
+.tidelift-link {
+	border-bottom-left-radius: 18px;
+	border-top-left-radius: 18px;
+	background-color: #626980;
+	box-sizing: border-box;
+	color: white;
+	display: flex;
+	top: 46px;
+	right: 0px;
+	position: absolute;
+	background-image: url('/img/tidelift-mark.png');
+	background-repeat: no-repeat;
+	background-position: 10px;
+	background-size: 12px;
+	padding: 6px 12px 6px 28px;
+}
+
+.tidelift-link:hover, .tidelift-link-inline:hover {
+	color: white;
 }
 
 #tideliftlink {
 	margin-left: 2px;
 	padding: 4px 6px 4px 20px;
-	background-image: url('/img/tidelift-mark.png');
-	background-repeat: no-repeat;
-	background-position: 4px;
-	background-size: 12px;
 	background-color: #4b5168;
 	border-radius: 5px;
 	color: white;
 }
 
+#clickForVideo {
+	padding: 20px 30px;
+	background-color: #DDD;
+	cursor: pointer;
+	margin-left: auto;
+	margin-right: auto;
+	margin-bottom: 40px;
+}
+
 pre {
 	text-align: left;
 }
 
+.tideliftb {
+	border-radius: 4px;
+	border: 2px solid #D9230F;
+	font-size: 28px;
+	width: 330px;
+	line-height: 48px;
+	display: inline-block;
+	margin: 16px 0;
+	text-align: center;
+}
+
+.tideliftb1 {
+	background-color: white;
+	float: left;
+	color: #D9230F;
+}
+
+.tideliftb1:hover {
+	color: #D9230F;
+}
+
+.tideliftb2 {
+	background-color: #D9230F;
+	color: #FCFCFC;
+}
+
+.tideliftb2:hover {
+	color: #FCFCFC;
+}
+
 .buttonLike {
 	cursor: pointer;
 	background: -webkit-linear-gradient(top, #FFFEF7, #CFCEC7);
@@ -63,6 +118,10 @@ pre {
 	margin-top: 20px;
 }
 
+.tidelift {
+	font-size: 16px;
+}
+
 .formErr {
 	color: #FF7777;
 }
diff --git a/website/resources/img/projectlombok-tidelift-mix-orig.png b/website/resources/img/projectlombok-tidelift-mix-orig.png
new file mode 100644
index 00000000..c3521b35
--- /dev/null
+++ b/website/resources/img/projectlombok-tidelift-mix-orig.png
diff --git a/website/resources/img/projectlombok-tidelift-mix.png b/website/resources/img/projectlombok-tidelift-mix.png
new file mode 100644
index 00000000..082570d3
--- /dev/null
+++ b/website/resources/img/projectlombok-tidelift-mix.png
diff --git a/website/resources/js/main.js b/website/resources/js/main.js
index eaaf2df5..3d18b996 100644
--- a/website/resources/js/main.js
+++ b/website/resources/js/main.js
@@ -37,7 +37,7 @@
 		if (self.data("clc")) return;
 		var href = self.attr("href");
 		self.data("clc", true);
-		if (!href || href.substr(0, 4) === "http" || href === "/api/" || href === "/" || href === "/supporters" || href === "/order-license") return;
+		if (!href || href.substr(0, 4) === "http" || href.substr(0, 1) === "#" || href === "/api/" || href === "/" || href === "/supporters" || href === "/order-license") return;
 		var ext = href.substr(href.length - 4, 4);
 		if (ext === ".xml" || ext === ".jar" || ext === ".pdf") return;
 		self.on("click", function(evt) {
diff --git a/website/templates/features/Builder.html b/website/templates/features/Builder.html
index 4fe416ee..af1ffd3a 100644
--- a/website/templates/features/Builder.html
+++ b/website/templates/features/Builder.html
@@ -160,6 +160,10 @@ public class JacksonExample {
 
 	<@f.confKeys>
 		<dt>
+			<code>lombok.builder.className</code> = [a java identifier with an optional star to indicate where the return type name goes] (default: <code>*Builder</code>)
+		</dt><dd>
+			Unless you explicitly pick the builder's class name with the <code>builderClassName</code> parameter, this name is chosen; any star in the name is replaced with the relevant return type.
+		</dd><dt>
 			<code>lombok.builder.flagUsage</code> = [<code>warning</code> | <code>error</code>] (default: not set)
 		</dt><dd>
 			Lombok will flag any usage of <code>@Builder</code> as a warning or error if configured.
diff --git a/website/templates/features/_features.html b/website/templates/features/_features.html
index f602b95b..f54a8fca 100644
--- a/website/templates/features/_features.html
+++ b/website/templates/features/_features.html
@@ -65,6 +65,7 @@
 
 <#macro scaffold title logline load=[]>
 	<@main.scaffold load title>
+		<a class="tidelift-link" href="/tidelift">Get Lombok for Enterprise</a>
 		<div class="page-header top5" id="featureContent">
 			<div class="row text-center">
 				<div class="header-group">
diff --git a/website/templates/features/experimental/SuperBuilder.html b/website/templates/features/experimental/SuperBuilder.html
index c68e28ca..5676b60c 100644
--- a/website/templates/features/experimental/SuperBuilder.html
+++ b/website/templates/features/experimental/SuperBuilder.html
@@ -52,6 +52,10 @@
 	
 	<@f.confKeys>
 		<dt>
+			<code>lombok.builder.className</code> = [a java identifier with an optional star to indicate where the return type name goes] (default: <code>*Builder</code>)
+		</dt><dd>
+			This is the name of the generated builder class; any star in the name is replaced with the relevant return type. Note that the parent class must also have the same setting (the entire type hierarchy annoated with <code>@SuperBuilder</code> needs the same setting).
+		</dd><dt>
 			<code>lombok.superBuilder.flagUsage</code> = [<code>warning</code> | <code>error</code>] (default: not set)
 		</dt><dd>
 			Lombok will flag any usage of <code>@SuperBuilder</code> as a warning or error if configured.
diff --git a/website/templates/features/experimental/index.html b/website/templates/features/experimental/index.html
index ba830ab5..112d30c4 100644
--- a/website/templates/features/experimental/index.html
+++ b/website/templates/features/experimental/index.html
@@ -2,6 +2,7 @@
 <#import "../_features.html" as f>
 
 <@main.scaffold title="Experimental">
+	<a class="tidelift-link" href="/tidelift">Get Lombok for Enterprise</a>
 	<div class="page-header top5">
 		<div class="row text-center">
 			<@main.h1 title="Lombok experimental features" />
diff --git a/website/templates/features/index.html b/website/templates/features/index.html
index cd4c9e26..06b47c0b 100644
--- a/website/templates/features/index.html
+++ b/website/templates/features/index.html
@@ -1,6 +1,7 @@
 <#import "../_scaffold.html" as main>
 
 <@main.scaffold title="Stable">
+	<a class="tidelift-link" href="/tidelift">Get Lombok for Enterprise</a>
 	<div class="page-header top5">
 		<div class="row text-center">
 			<@main.h1 title="Lombok features" />
diff --git a/website/templates/main.html b/website/templates/main.html
index 03073436..be8a3bd9 100644
--- a/website/templates/main.html
+++ b/website/templates/main.html
@@ -1,5 +1,6 @@
 <#import "/_scaffold.html" as main>
 <@main.scaffold load=["/js/supporters.js"]>
+	<a class="tidelift-link" href="/tidelift">Get Lombok for Enterprise</a>
 	<div class="page-header top5">
 		<div class="row text-center">
 			<@main.h1 title="Project Lombok" />
@@ -33,8 +34,5 @@
 			<h2 class="introText" hidden="hidden">Project Lombok is <a href="/supporters">powered by</a>:</h2>
 			<div class="supporterFooter" hidden="hidden"><a class="buttonLike" href="/order-license-info">I want to support Project Lombok too!</a></div>
 		</div>
-		<div class="row text-center tidelift-para">
-			Looking for professional support of Project Lombok? Lombok is now part of a <a id="tideliftlink" href="https://tidelift.com/subscription/pkg/maven-org-projectlombok-lombok?utm_source=lombok&utm_medium=referral&utm_campaign=website">Tidelift subscription</a>
-		</div>
 	</div>
 </@main.scaffold>
diff --git a/website/templates/order-license-info.html b/website/templates/order-license-info.html
index 735bd4cb..f5839c0a 100644
--- a/website/templates/order-license-info.html
+++ b/website/templates/order-license-info.html
@@ -9,7 +9,7 @@
 			<p>
 				Tidelift offers professional support of open source tools. When you have a Tidelift subscription, they will help you inventory all the various open source tools and libraries you use, give one central location to check compliance, and a single channel for release notes and security advisories. The bulk of the tidelift subscription fee is redistributed to major open source projects, and Project Lombok is one of those 'lifted' projects. Therefore, your Tidelift subscription helps maintain Project Lombok!
 			</p><p>
-				We recommend a <a id="tideliftlink" href="https://tidelift.com/subscription/pkg/maven-org-projectlombok-lombok?utm_source=lombok&utm_medium=referral&utm_campaign=website">Tidelift subscription</a> to any corporation that uses Project Lombok.
+				We recommend a <a class="tidelift-link-inline" href="https://tidelift.com/subscription/pkg/maven-org-projectlombok-lombok?utm_source=lombok&utm_medium=referral&utm_campaign=orderdonate">Tidelift subscription</a> to any corporation that uses Project Lombok.
 		</div>
 		<div class="row text-center">
 			<h2>Order a professional or enterprise license</h2>
diff --git a/website/templates/tidelift.html b/website/templates/tidelift.html
new file mode 100644
index 00000000..7f0ab88b
--- /dev/null
+++ b/website/templates/tidelift.html
@@ -0,0 +1,34 @@
+<#import "/_scaffold.html" as main>
+
+<@main.scaffold title="Project Lombok for Enterprise">
+	<div class="page-header top5 tidelift">
+		<div class="row text-center">
+			<h2>Available as part of the Tidelift Subscription</h2>
+		</div>
+		<div class="row">
+			<img src="/img/projectlombok-tidelift-mix.png" width="200" height="150" class="pull-right" alt="tidelift+lombok" />
+			<p>
+				Project Lombok and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use.
+			</p><p>
+				If you want the flexibility of open source and the confidence of commercial-grade software, this is for you.
+			</p>
+		</div>
+		<div class="row text-center">
+			<a class="tideliftb tideliftb1" href="https://tidelift.com/subscription/pkg/maven-org-projectlombok-lombok?utm_source=lombok&utm_medium=referral&utm_campaign=enterprise">LEARN MORE</a> <a class="tideliftb tideliftb2" href="https://tidelift.com/subscription/request-a-demo?utm_source=lombok&utm_medium=referral&utm_campaign=enterprise">REQUEST A DEMO</a>
+		</div>
+		<div class="row text-center">
+			<h2>The Tidelift Subscription manages your dependencies for you</h2>
+		</div>
+		<div class="row">
+			<p>
+				<ul>
+					<li>Get the tools you need to continuously catalog and understand the open source software that your application depends on.</li>
+					<li>Your subscription helps pay the open source maintainers of the exact packages you use to ensure they meet the standards you require.</li>
+					<li>Address issues proactively, with tools that scan for new security, licensing, and maintenance issues, and alert our participating open source maintainers so they can resolve them on your behalf.</li>
+					<li>Measure and improve your open source dependencies' health—which improves your app’s health—and get a short list of high-impact steps your team can take to improve them even more.</li>
+					<li>Get commercial assurances that don't come for free with open source packages, like intellectual property indemnification and support under a service level agreement. You expect these guarantees from proprietary software, and you can have them when using open source as well.</li>
+				</ul>
+				The end result? All of the capabilities you expect from commercial-grade software, for the full breadth of open source you use. That means less time grappling with esoteric open source trivia, and more time building your own applications—and your business.
+		</div>
+	</div>
+</@main.scaffold>