Skip to content

fix conflicts with tailwindcss #1388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Containers/Sections/BringYourOwnCode/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const Index = (): JSX.Element => {

return (
<section className="point6" id="bring-your-own-code">
<div className="prose">
<div className="prose2">
<h2>
Bring your own
<br />
Expand Down
2 changes: 1 addition & 1 deletion src/Containers/Sections/PowerFulTools/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const PowerFulTools = () => {
return (
<div className="darkWash">
<section className="point4" id="powerful-tools">
<div className="prose">
<div className="prose2">
<h2>
Move faster with
<br />
Expand Down
2 changes: 1 addition & 1 deletion src/Containers/Sections/PredictableResults/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const PredictableResults = () => {
}, [])
return (
<section className="point1" id="predictable-results">
<div className="prose">
<div className="prose2">
<h2>
Ask for what you need,
<br />
Expand Down
4 changes: 2 additions & 2 deletions src/Containers/Sections/SingleRequest/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const SingleRequest = () => {
return (
<div className="grayWash">
<section className="point2" id="single-request">
<div className="prose">
<div className="prose2">
<h2>
Get many resources
<br />
Expand Down Expand Up @@ -64,4 +64,4 @@ const SingleRequest = () => {
);
};

export default SingleRequest;
export default SingleRequest;
2 changes: 1 addition & 1 deletion src/Containers/Sections/TypeSystem/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const TypeSysyem = () => {
}, [])
return (
<section className="point3" id="type-system">
<div className="prose">
<div className="prose2">
<h2>
Describe what&rsquo;s possible
<br />
Expand Down
2 changes: 1 addition & 1 deletion src/Containers/Sections/WhosUsing/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Link } from "gatsby"
const WhosUsing = () => {
return (
<section className="powered-by" id="whos-using">
<div className="prose">
<div className="prose2">
<h2>Who&rsquo;s using GraphQL?</h2>
<p>
Facebook's mobile apps have been powered by GraphQL since 2012. A
Expand Down
2 changes: 1 addition & 1 deletion src/Containers/Sections/WithoutVersion/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const WithoutVersion = () => {
return (
<div className="grayWash">
<section className="point5" id="without-versions">
<div className="prose">
<div className="prose2">
<h2>
Evolve your API
<br />
Expand Down
3 changes: 2 additions & 1 deletion src/assets/css/_css/graphql.less
Original file line number Diff line number Diff line change
Expand Up @@ -289,10 +289,11 @@ footer {
padding: 3px 10px;
position: relative;

img {
svg {
opacity: 0.6;
position: absolute;
height: 0.85em;
width: 0.85em;
right: ~"calc(100% - 4px)";
top: 50%;
transform: translateY(-50%);
Expand Down
16 changes: 8 additions & 8 deletions src/assets/css/_css/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ div.index {
min-height: 75vh;
@media screen and (max-width: 1019px) {
min-height: none;
.prose {
.prose2 {
text-align: center;
}
}
Expand All @@ -350,7 +350,7 @@ div.index {
justify-content: space-between;
}

.prose {
.prose2 {
max-width: 415px;
}

Expand Down Expand Up @@ -399,7 +399,7 @@ div.index {
justify-content: space-between;
}

.prose {
.prose2 {
max-width: 415px;
}

Expand Down Expand Up @@ -490,7 +490,7 @@ div.index {
justify-content: space-between;
}

.prose {
.prose2 {
max-width: 415px;
}

Expand Down Expand Up @@ -535,7 +535,7 @@ div.index {
font-family: Palatino, Georgia, serif;
}

.prose {
.prose2 {
display: flex;
flex-direction: column;
flex: 1;
Expand Down Expand Up @@ -574,7 +574,7 @@ div.index {
justify-content: space-between;
}

.prose {
.prose2 {
max-width: 415px;
}

Expand Down Expand Up @@ -741,7 +741,7 @@ div.index {
justify-content: space-between;
}

.prose {
.prose2 {
max-width: 415px;
}

Expand Down Expand Up @@ -807,7 +807,7 @@ div.index {
padding-bottom: 6em;
text-align: center;

.prose {
.prose2 {
max-width: 545px;
text-align: center;
margin: 0 auto;
Expand Down
2 changes: 1 addition & 1 deletion src/assets/css/_css/users.less
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ section.whos-using-page, section.foundation-members-page {
}

section.whos-using-page {
.prose {
.prose2 {
max-width: 560px;
text-align: center;
margin: 0 auto;
Expand Down
2 changes: 1 addition & 1 deletion src/assets/css/global.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@tailwind base;
/*@tailwind base;*/
@tailwind components;
@tailwind utilities;
29 changes: 16 additions & 13 deletions src/components/Footer/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import React from "react"
import Link from "../Link"
import { ReactComponent as GitHubIcon } from "../../../static/img/logos/github.svg"
import { ReactComponent as TwitterIcon } from "../../../static/img/logos/twitter.svg"
import { ReactComponent as DiscordIcon } from "../../../static/img/logos/discord.svg"
import { ReactComponent as StackOverflowIcon } from "../../../static/img/logos/stackoverflow.svg"
import { ReactComponent as EditIcon } from "../../../static/img/edit.svg"

interface LinkItem {
text: string
Expand Down Expand Up @@ -31,7 +36,7 @@ const getLinks = (sourcePath?: string): FooterLinks[] => [
{
text: "GitHub",
href: "https://github.com/graphql",
icon: "/img/logos/github.svg",
icon: GitHubIcon,
},
{ text: "GraphQL Specification", href: "https://spec.graphql.org" },
{ text: "Libraries & Tools", href: "/code/" },
Expand All @@ -45,17 +50,17 @@ const getLinks = (sourcePath?: string): FooterLinks[] => [
{
text: "@graphql",
href: "https://twitter.com/graphql",
icon: "/img/logos/twitter.svg",
icon: TwitterIcon,
},
{
text: "Discord",
href: "https://discord.graphql.org/",
icon: "/img/logos/discord.svg",
icon: DiscordIcon,
},
{
text: "Stack Overflow",
href: "http://stackoverflow.com/questions/tagged/graphql",
icon: "/img/logos/stackoverflow.svg",
icon: StackOverflowIcon,
},
{ text: "Resources", href: "/community/users/" },
{ text: "Events", href: "/community/upcoming-events/" },
Expand All @@ -76,7 +81,7 @@ const getLinks = (sourcePath?: string): FooterLinks[] => [
href:
"https://github.com/graphql/graphql.github.io/edit/source/" +
sourcePath,
icon: "/img/edit.svg",
icon: EditIcon,
},
].filter(Boolean) as LinkItem[],
},
Expand All @@ -97,9 +102,9 @@ const Footer = ({ sourcePath }: { sourcePath?: string }) => {
<span>{section.text}</span>
)}
</h5>
{section.subsections.map((subsection: any, i) => (
<Link key={i} href={subsection.href}>
{subsection.icon && <img src={subsection.icon} />}
{section.subsections.map((subsection, i) => (
<Link key={i} href={subsection.href} className="!flex items-center gap-2">
{subsection.icon && <subsection.icon />}
{subsection.text}
</Link>
))}
Expand All @@ -108,13 +113,11 @@ const Footer = ({ sourcePath }: { sourcePath?: string }) => {
</section>
<section className="copyright">
Copyright © {`${new Date().getFullYear()}`} The GraphQL Foundation.
All rights reserved.<br />
All rights reserved.
<br />
For web site terms of use, trademark policy and general project
policies please see&nbsp;
<a
href="https://lfprojects.org"
target="_blank"
>
<a href="https://lfprojects.org" target="_blank">
https://lfprojects.org
</a>
.
Expand Down
2 changes: 1 addition & 1 deletion src/pages/foundation/members.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default ({ pageContext }: PageProps<{}, { sourcePath: string }>) => {
pageContext={pageContext}
>
<section className="foundation-members-page">
<div className="prose">
<div className="prose2">
<h1>GraphQL Foundation members</h1>
<p>
The <a href="/foundation/">GraphQL Foundation</a> is the primary way
Expand Down
2 changes: 1 addition & 1 deletion src/pages/users.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default ({ pageContext }: PageProps<{}, { sourcePath: string }>) => {
return (
<Layout pageContext={pageContext}>
<section className="whos-using-page">
<div className="prose">
<div className="prose2">
<h1>Who&rsquo;s using GraphQL?</h1>
<p>
GraphQL is used by teams of all sizes in many different environments
Expand Down