Skip to content
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.

Sign up for GitHub

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

Update and rename _2024_12__Adoption % – Have Developers Embraced Git… #3402

Closed
wants to merge 3 commits into from
Closed

Update and rename _2024_12__Adoption % – Have Developers Embraced Git… #3402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db72e10
Update and rename _2024_12__Adoption % – Have Developers Embraced Git…
PennyWalker Dec 13, 2024
3b2c4e9
Merge branch 'main' into PennyWalker-patch-2
Calinator444 Dec 15, 2024
82934eb
fixed linting errors
Calinator444 Dec 15, 2024
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 .eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"tailwindcss/no-custom-classname": [
"error",
{
"whitelist": ["g\\-yt.+", "legend", "dark"],
"whitelist": ["g\\-yt.+", "prose-.+", "legend", "dark", "text-3xl/9"],
},
],
"prettier/prettier": [
Expand Down
2 changes: 1 addition & 1 deletion app/articles/[filename]/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ const ArticlePage = ({ props, tinaProps }: ArticlePageProps) => {
{data.articles.subTitle && (
<section
className={classNames(
"prose mx-auto w-full max-w-9xl flex-row px-8 pb-8 prose-h1:my-0 prose-h1:pt-8 prose-h2:mt-8 prose-img:my-0 lg:flex"
"prose prose-h1:my-0 prose-h1:pt-8 prose-h2:mt-8 prose-img:my-0 mx-auto w-full max-w-9xl flex-row px-8 pb-8 lg:flex"
)}
>
<div data-tina-field={tinaField(data.articles, "subTitle")}>
Expand Down
2 changes: 1 addition & 1 deletion app/articles/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ function ArticlesIndexPage({ props, tinaProps }: ArticlesIndexPageProps) {
</Section>
<section
className={classNames(
"prose mx-auto w-full max-w-9xl flex-row px-8 pb-8 prose-h1:my-0 prose-h1:pt-8 prose-h2:mt-8 prose-img:my-0 md:flex"
"prose prose-h1:my-0 prose-h1:pt-8 prose-h2:mt-8 prose-img:my-0 mx-auto w-full max-w-9xl flex-row px-8 pb-8 md:flex"
)}
>
{data.articlesIndex._body.children.length > 0 && (
Expand Down
2 changes: 1 addition & 1 deletion app/company/[filename]/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export default function CompanyPage({ tinaProps, props }) {
{data.company.subTitle && (
<section
className={classNames(
"prose mx-auto w-full max-w-9xl flex-row px-8 pb-8 prose-h1:my-0 prose-h1:pt-8 prose-h2:mt-8 prose-img:my-0",
"prose prose-h1:my-0 prose-h1:pt-8 prose-h2:mt-8 prose-img:my-0 mx-auto w-full max-w-9xl flex-row px-8 pb-8",
data.company.fullWidthBody ? "" : "md:flex"
)}
>
Expand Down
2 changes: 1 addition & 1 deletion app/products/[filename]/products-content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default function ProductsContent({ props }) {
</Section>
<Container
className={
"prose flex-1 pt-4 prose-h1:!my-0 prose-h1:!pt-4 prose-h3:!mt-0 prose-img:!my-0"
"prose prose-h1:!my-0 prose-h1:!pt-4 prose-h3:!mt-0 prose-img:!my-0 flex-1 pt-4"
}
>
<TinaMarkdown
Expand Down
2 changes: 1 addition & 1 deletion components/articles/articleCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const ArticleCardContent = ({
position={userPosition}
image={userImage}
/>
<div className="font-normal prose-p:mt-0">{body}</div>
<div className="prose-p:mt-0 font-normal">{body}</div>
</div>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion components/blocks/colorBlock.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const ColorBlock = (data: ColorBlockProps) => {
const { title, subTitle, colorRow } = data;
return (
<Container padding="md:px-8 px-0">
<div className="prose max-w-full prose-p:my-0.75">
<div className="prose prose-p:my-0.75 max-w-full">
<div className="container mx-auto py-4">
<h2 data-tina-field={tinaField(data, "title")}>{title}</h2>
<p data-tina-field={tinaField(data, "subTitle")} className="mb-0.5">
Expand Down
2 changes: 1 addition & 1 deletion components/blocks/downloadBlock.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const bgOptions = {
export const DownloadBlock = (data: DownloadBlockProps) => {
const { title, downloads, bottomBorder } = data;
return (
<Container className="prose !px-0 py-4 prose-img:my-0">
<Container className="prose prose-img:my-0 !px-0 py-4">
<h2 data-tina-field={tinaField(data, "title")}>{title}</h2>

<div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-4">
Expand Down
4 changes: 2 additions & 2 deletions components/blocks/internalCarousel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const CarouselBody = ({
}: InternalCarouselProps) => {
return (
<div key={header} className={header ? "" : "hidden"}>
<div className="mt-2 flex items-center justify-between text-left font-semibold text-sswRed prose-p:py-0">
<div className="prose-p:py-0 mt-2 flex items-center justify-between text-left font-semibold text-sswRed">
<h3>{header}</h3>
<span className={website ? "" : "hidden"}>
{website && (
Expand All @@ -108,7 +108,7 @@ const CarouselBody = ({
)}
</span>
</div>
<div className="text-left prose-p:py-2">
<div className="prose-p:py-2 text-left">
<TinaMarkdown content={paragraph} />
</div>
<div className="flex flex-wrap">
Expand Down
2 changes: 1 addition & 1 deletion components/filter/clients.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export const ClientsFilter = ({ clients, categories }: ClientsFilterProps) => {
</CustomLink>
</div>
)}
<div className="prose max-w-full prose-img:my-0">
<div className="prose prose-img:my-0 max-w-full">
<TinaMarkdown
content={client.content}
components={componentRenderer}
Expand Down
2 changes: 1 addition & 1 deletion components/filter/events.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ const Event = ({ visible, event, jsonLd }: EventProps) => {
</div>
</div>
</div>
<div className="prose max-w-full prose-img:mx-1 prose-img:my-0 prose-img:inline">
<div className="prose prose-img:mx-1 prose-img:my-0 prose-img:inline max-w-full">
<TinaMarkdown content={event?.description} />
</div>
<div className="mb-1 mt-6 p-0 text-end">
Expand Down
2 changes: 1 addition & 1 deletion components/technologyCard/technologyCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const TechnologyCard: FC<TechnologyCardProps> = (props) => {

<div
data-tina-field={tinaField(props, "body")}
className="prose max-w-full grow prose-strong:text-sswRed prose-ul:grid prose-ul:grid-flow-col prose-ul:grid-rows-12 prose-ul:text-left descendant-div:!m-0 md:prose-p:text-justify"
className="prose prose-strong:text-sswRed prose-ul:grid prose-ul:grid-flow-col prose-ul:grid-rows-12 prose-ul:text-left md:prose-p:text-justify max-w-full grow descendant-div:!m-0"
>
<TinaMarkdown content={body} />
</div>
Expand Down
2 changes: 1 addition & 1 deletion components/util/consulting/benefits.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const BenefitCard = (props) => {
</h4>
<section
data-tina-field={tinaField(props.data, "description")}
className="mx-auto w-full max-w-full p-0 text-center text-sm font-light leading-normal prose-p:m-0 prose-p:first-of-type:pt-0 prose-strong:font-bold prose-ul:list-disc prose-li:m-0 prose-li:list-item prose-li:font-normal md:text-left md:text-base"
className="prose-p:m-0 prose-p:first-of-type:pt-0 prose-strong:font-bold prose-ul:list-disc prose-li:m-0 prose-li:list-item prose-li:font-normal mx-auto w-full max-w-full p-0 text-center text-sm font-light leading-normal md:text-left md:text-base"
>
<TinaMarkdown content={description} />
</section>
Expand Down
2 changes: 1 addition & 1 deletion pages/netug/[[...filename]].tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ export default function NETUGPage(
/>
</Section>
)}
<Container className="prose py-4 prose-h1:pt-2" size="custom">
<Container className="prose prose-h1:pt-2 py-4" size="custom">
<TinaMarkdown
content={data.userGroupPage._body}
components={componentRenderer}
Expand Down
Loading