Merge pull request #1158 from szarnyasg/remove-discord-ribbon

duckdb · Sep 28, 2023 · 0ff48e6 · 0ff48e6
2 parents 79ef4ed + 40c79a0
commit 0ff48e6
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 104 deletions.
diff --git a/css/main.scss b/css/main.scss
@@ -1495,63 +1495,6 @@ body.installation{
 	}
 }
 
-/** DISCORD BANNER ON HOME PAGE **/
-.discord{
-	height: 55px;
-	color: white;
-	background-color: #5865f2;
-	margin-top: 53px;
-	position: relative;
-	width: 100%;
-	justify-content: center;
-	align-items: center;
-	column-gap: 40px;
-	overflow: hidden;
-	display: none;
-	> svg{
-		width: 35px;
-		height: auto;
-	}
-	.button{
-		border: 1px solid white;
-		padding: 4px 27px 4px 10px;
-		display: block;
-		color: white;
-		text-decoration: none;
-		transition: color .4s, background .4s;
-		span::after{
-			content: "→";
-			font-family: "DuckDB-Symbol";
-			margin-left: 4px;
-			transition: transform .3s, color .3s;
-			position: absolute;
-		}
-		&:hover span::after{
-			transform: translateX(3px);
-			color: #5865f2;
-		}
-		&:hover{
-			color: #5865f2;
-			background-color: white;
-		}
-	}
-	.button.notonmobile{
-		display: block;
-	}
-	.button.onlymobile{
-		display: none;
-	}
-	p{
-		font-size: 120%;
-	}
-	.discordclose{
-		position: absolute;
-		right: 30px;
-		top: 19px;
-		cursor: pointer;
-	}
-}
-
 
 /** GENERATED HTML FIXES FOR DOCUMENTATION **/
 div.bodywrapper{

diff --git a/css/mobilestyles.scss b/css/mobilestyles.scss
@@ -360,25 +360,6 @@
 		}
 	}
 
-	.discord{
-		column-gap: 25px;
-		>p{
-			display: none;
-		}
-		>svg{
-			margin-left: -40px;
-		}
-		.button.notonmobile{
-			display: none;
-		}
-		.button.onlymobile{
-			display: block;
-		}
-		.discordclose{
-			right: 25px;
-		}
-	}
-
 	/** NEWS **/
 
 	.newswrap{

diff --git a/docs/api/python/spark_api.md b/docs/api/python/spark_api.md
@@ -5,7 +5,7 @@ title: Spark API
 
 DuckDB's Python client offers a Spark-compatible API. The API aims to be fully compatible with the [PySpark API](https://spark.apache.org/docs/3.5.0/api/python/reference/index.html), allowing you to use the familiar Spark API. All statements are translated to DuckDB's internal plans using our [relational API](relational_api) and executed using DuckDB's query engine.
 
-> This API is currently experimental and features are still missing. We are very interested in feedback. Please report any functionality that you are missing, either through Discord or on [GitHub](https://github.com/duckdb/duckdb/issues).
+> This API is currently experimental and features are still missing. We are very interested in feedback. Please report any functionality that you are missing, either through [Discord](https://discord.duckdb.org) or on [GitHub](https://github.com/duckdb/duckdb/issues).
 
 ## Example
 

diff --git a/index.html b/index.html
@@ -6,20 +6,6 @@
 body_class: landing nowrap
 ---
 
-<div class="discord">
-	<svg width="36" height="27" viewBox="0 0 36 27" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M29.713 2.24A28.708 28.708 0 0 0 22.57.003a.107.107 0 0 0-.066.009.11.11 0 0 0-.05.045c-.306.554-.648 1.275-.888 1.845a26.482 26.482 0 0 0-8.025 0 18.732 18.732 0 0 0-.902-1.845.113.113 0 0 0-.05-.047.11.11 0 0 0-.066-.01 28.685 28.685 0 0 0-7.144 2.237.103.103 0 0 0-.047.04C.781 9.14-.467 15.833.145 22.442a.123.123 0 0 0 .046.082 29.01 29.01 0 0 0 8.764 4.47.111.111 0 0 0 .123-.04 20.838 20.838 0 0 0 1.793-2.944.113.113 0 0 0-.06-.156 19.081 19.081 0 0 1-2.738-1.317.11.11 0 0 1-.055-.09.115.115 0 0 1 .044-.097c.184-.14.368-.285.544-.43a.109.109 0 0 1 .114-.016c5.743 2.646 11.963 2.646 17.639 0a.108.108 0 0 1 .115.014c.176.147.358.293.544.432a.113.113 0 0 1 .03.149.112.112 0 0 1-.039.038c-.874.516-1.784.953-2.739 1.316a.108.108 0 0 0-.065.065.117.117 0 0 0 .005.092 23.633 23.633 0 0 0 1.792 2.943c.014.02.033.034.055.041a.11.11 0 0 0 .068.001 28.91 28.91 0 0 0 8.777-4.471.114.114 0 0 0 .047-.081c.731-7.64-1.225-14.28-5.19-20.162a.089.089 0 0 0-.046-.042ZM11.73 18.416c-1.729 0-3.155-1.603-3.155-3.57 0-1.967 1.398-3.57 3.155-3.57 1.77 0 3.182 1.616 3.154 3.57 0 1.968-1.398 3.57-3.154 3.57Zm11.663 0c-1.73 0-3.155-1.603-3.155-3.57 0-1.967 1.397-3.57 3.155-3.57 1.77 0 3.182 1.616 3.154 3.57 0 1.968-1.383 3.57-3.154 3.57Z" fill="#fff"/></svg>
-	<p>Join the DuckDB Discord server!</p>
-	<a class="button notonmobile" href="https://discord.duckdb.org">
-		<span>Join now</span>
-	</a>
-	<a class="button onlymobile" href="https://discord.duckdb.org">
-		<span>Join DuckDB on Discord</span>
-	</a>
-	<div class="discordclose">
-		<svg width="13" height="13" viewBox="0 0 13 13" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M12.972 11.648 7.736 6.44l5.236-5.208L11.712 0 6.504 5.208 1.296 0 .064 1.232 5.272 6.44.064 11.648l1.232 1.232 5.208-5.208 5.208 5.208 1.26-1.232Z" fill="#fff"/></svg>
-	</div>
-</div>
-
 <section>
 	<div class="welcome">
 		<div id="duckdbdanimationcircled" style="width: 75px; height: 75px; margin: 0 auto; margin-bottom: 35px;"></div>

diff --git a/js/script.js b/js/script.js
@@ -320,7 +320,7 @@ $(document).ready(function(){
 	$('a').filter(function() {
 		return this.hostname && this.hostname !== location.hostname;
 	}).addClass("externallink").attr('target','_blank');
-	$('.landingmenu .external a.externallink, .mainlinks a.externallink, .discord a.externallink').removeClass('externallink'); // Remove Class from header elements
+	$('.landingmenu .external a.externallink, .mainlinks a.externallink').removeClass('externallink'); // Remove Class from header elements
 	$('.footercontent a.externallink').removeClass('externallink'); // Remove Class from footer elements
 	$('table a.externallink:contains(GitHub)').removeClass('externallink').addClass('nobg'); // Remove Class from GitHub Links in Table
 
@@ -413,18 +413,7 @@ $(document).ready(function(){
 		}
 		return item.value
 	}
-	// CLOSE DISCORD BANNER ON HOME PAGE
-	const showdiscord = getWithExpiry("discordBanner");
-	if(showdiscord == false){
-		$('.discord').css('display', 'none');
-	} else {
-		$('.discord').css('display', 'flex');
-	}
-	$('.discordclose').click(function(){
-		setWithExpiry('discordBanner', false, 172800000); // 900000 = 15 min, 172800000 = 2 days
-		//$('.discord').slideUp();
-		$('.discord').animate({ height: 0 }, 300);
-	});
+
 
 
 	// SEARCH